Bug 1524282 - Disable fingerprinting/cryptomining blocking on Nightly while the UI bits aren't ready yet; r=baku
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 31 Jan 2019 21:42:19 +0000
changeset 456328 9097dc60840f93fe9ebb697574c82cf15745ff37
parent 456327 9f49631d6536a27752469cac43e60ed1f19eed55
child 456329 9e91d60619e9af4aab304501770df7bdd3800699
push id35478
push usershindli@mozilla.com
push dateFri, 01 Feb 2019 03:55:46 +0000
treeherdermozilla-central@945770882765 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1524282
milestone67.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 1524282 - Disable fingerprinting/cryptomining blocking on Nightly while the UI bits aren't ready yet; r=baku Differential Revision: https://phabricator.services.mozilla.com/D18274
modules/libpref/init/StaticPrefList.h
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1864,34 +1864,26 @@ VARCACHE_PREF(
 // Annotate channels based on the tracking protection list in all modes
 VARCACHE_PREF(
   "privacy.trackingprotection.annotate_channels",
    privacy_trackingprotection_annotate_channels,
   bool, true
 )
 
 // Block 3rd party fingerprinting resources.
-#ifdef NIGHTLY_BUILD
-# define PREF_VALUE true
-#else
 # define PREF_VALUE false
-#endif
 VARCACHE_PREF(
   "privacy.trackingprotection.fingerprinting.enabled",
    privacy_trackingprotection_fingerprinting_enabled,
   bool, PREF_VALUE
 )
 #undef PREF_VALUE
 
 // Block 3rd party cryptomining resources.
-#ifdef NIGHTLY_BUILD
-# define PREF_VALUE true
-#else
 # define PREF_VALUE false
-#endif
 VARCACHE_PREF(
   "privacy.trackingprotection.cryptomining.enabled",
    privacy_trackingprotection_cryptomining_enabled,
   bool, PREF_VALUE
 )
 #undef PREF_VALUE
 
 // Lower the priority of network loads for resources on the tracking protection