Bug 1397930 - Use the same Safe Browsing client ID on all official builds. r=gcp
☠☠ backed out by 08b377af73bb ☠ ☠
authorFrancois Marier <francois@mozilla.com>
Thu, 07 Sep 2017 17:40:52 -0700
changeset 430231 956163f1fa0e3a1c5df926738f9711153b641b3c
parent 430230 9ac8940da5c3bdc417a057c8e424c6655a1c9e88
child 430232 408cc2a3f0b55afa5303fed7bdb6d757e2ef087a
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgcp
bugs1397930
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1397930 - Use the same Safe Browsing client ID on all official builds. r=gcp Also use the UA name on all non-official builds, not just Fennec. MozReview-Commit-ID: 4pKVz1mFnEl
mobile/android/app/mobile.js
modules/libpref/init/all.js
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -639,17 +639,19 @@ pref("media.hls.enabled", true);
 // Whether to suspend decoding of videos in background tabs.
 pref("media.suspend-bkgnd-video.enabled", true);
 
 // optimize images memory usage
 pref("image.downscale-during-decode.enabled", true);
 
 pref("browser.safebrowsing.downloads.enabled", false);
 
+#ifndef MOZILLA_OFFICIAL
 pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
+#endif
 
 // True if this is the first time we are showing about:firstrun
 pref("browser.firstrun.show.uidiscovery", true);
 pref("browser.firstrun.show.localepicker", false);
 
 // True if you always want dump() to work
 //
 // On Android, you also need to do the following for the output
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5426,17 +5426,17 @@ pref("browser.safebrowsing.debug", false
 // Allow users to ignore Safe Browsing warnings.
 pref("browser.safebrowsing.allowOverride", true);
 
 #ifdef MOZILLA_OFFICIAL
 // Normally the "client ID" sent in updates is appinfo.name, but for
 // official Firefox releases from Mozilla we use a special identifier.
 pref("browser.safebrowsing.id", "navclient-auto-ffox");
 #else
-pref("browser.safebrowsing.id", "Firefox");
+pref("browser.safebrowsing.id", "%NAME%");
 #endif
 
 // Download protection
 #ifdef MOZILLA_OFFICIAL
 pref("browser.safebrowsing.downloads.enabled", true);
 #else
 pref("browser.safebrowsing.downloads.enabled", false);
 #endif