Bug 1397930 - Use the same Safe Browsing client ID on all official builds. r=gcp
authorFrancois Marier <francois@mozilla.com>
Wed, 13 Sep 2017 14:04:26 -0700
changeset 430262 cfd5924a10e353e60b2dc93837954b446e3d422e
parent 430261 c9b73b821bd5393ffc64a1cc81085095a696ecb0
child 430263 01b9bea7d2ba241fba343aedf6decdcf2fac851f
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 MozReview-Commit-ID: 5der4PiHWyv
mobile/android/app/mobile.js
modules/libpref/init/all.js
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -639,18 +639,16 @@ 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);
 
-pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
-
 // 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
 // to show up in logcat:
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5421,19 +5421,19 @@ pref("urlclassifier.alternate_error_page
 // Enable phishing & malware protection.
 pref("browser.safebrowsing.phishing.enabled", true);
 pref("browser.safebrowsing.malware.enabled", true);
 pref("browser.safebrowsing.debug", false);
 
 // Allow users to ignore Safe Browsing warnings.
 pref("browser.safebrowsing.allowOverride", true);
 
+// These names are approved by the Google Safe Browsing team.
+// Any changes must be coordinated with them.
 #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");
 #endif
 
 // Download protection
 #ifdef MOZILLA_OFFICIAL
 pref("browser.safebrowsing.downloads.enabled", true);