Bug 1332770 - Fix the google4 provider is showing up as other in some telemetry pings. r=francois

MozReview-Commit-ID: KbpYAnf6qxd
This commit is contained in:
Dimi Lee
2017-01-27 18:02:36 +08:00
parent c29aa91bab
commit 1859178ca5
5 changed files with 32 additions and 13 deletions

View File

@@ -279,7 +279,9 @@ nsUrlClassifierUtils::GetProvider(const nsACString& aTableName,
{
MutexAutoLock lock(mProviderDictLock);
nsCString* provider = nullptr;
if (mProviderDict.Get(aTableName, &provider)) {
if (StringBeginsWith(aTableName, NS_LITERAL_CSTRING("test"))) {
aProvider = NS_LITERAL_CSTRING(TESTING_TABLE_PROVIDER_NAME);
} else if (mProviderDict.Get(aTableName, &provider)) {
aProvider = provider ? *provider : EmptyCString();
} else {
aProvider = EmptyCString();
@@ -296,7 +298,8 @@ nsUrlClassifierUtils::GetTelemetryProvider(const nsACString& aTableName,
// Empty provider is filtered as "other"
if (!NS_LITERAL_CSTRING("mozilla").Equals(aProvider) &&
!NS_LITERAL_CSTRING("google").Equals(aProvider) &&
!NS_LITERAL_CSTRING("google4").Equals(aProvider)) {
!NS_LITERAL_CSTRING("google4").Equals(aProvider) &&
!NS_LITERAL_CSTRING(TESTING_TABLE_PROVIDER_NAME).Equals(aProvider)) {
aProvider.Assign(NS_LITERAL_CSTRING("other"));
}