Bug 1594521 - enable remote settings blocklist on nightly, r=mconley
☠☠ backed out by c1c84c2869be ☠ ☠
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 15 Nov 2019 16:54:23 +0000
changeset 502237 dea221c2e93e9ebc1c9d117b42a42c9399f7b744
parent 502236 65afd2b4e42f815c904f26f4705a61b9d87e4aa8
child 502238 61ebc1a22544fa44ac2a4f9a2f120488a5f1d614
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1594521
milestone72.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 1594521 - enable remote settings blocklist on nightly, r=mconley Differential Revision: https://phabricator.services.mozilla.com/D52939
browser/base/content/test/performance/browser_startup_mainthreadio.js
modules/libpref/init/all.js
toolkit/mozapps/extensions/Blocklist.jsm
--- a/browser/base/content/test/performance/browser_startup_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -227,21 +227,16 @@ const startupPhases = {
   "before opening first browser window": [
     {
       // bug 1541226
       path: "ProfD:",
       condition: WIN,
       stat: 1,
     },
     {
-      path: "XCurProcD:blocklist.xml",
-      condition: WIN,
-      stat: 1,
-    },
-    {
       // bug 1534745
       path: "ProfD:cookies.sqlite-journal",
       condition: !LINUX,
       stat: 3,
       write: 4,
     },
     {
       // bug 1534745
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2300,16 +2300,18 @@ pref("extensions.abuseReport.openDialog"
 pref("extensions.abuseReport.url", "https://services.addons.mozilla.org/api/v4/abuse/report/addon/");
 pref("extensions.abuseReport.amoDetailsURL", "https://services.addons.mozilla.org/api/v4/addons/addon/");
 
 // Blocklist preferences
 pref("extensions.blocklist.enabled", true);
 // OneCRL freshness checking depends on this value, so if you change it,
 // please also update security.onecrl.maximum_staleness_in_seconds.
 pref("extensions.blocklist.interval", 86400);
+// Whether to use the XML backend (true) or the remotesettings one (false).
+pref("extensions.blocklist.useXML", false);
 // Required blocklist freshness for OneCRL OCSP bypass
 // (default is 1.25x extensions.blocklist.interval, or 30 hours)
 pref("security.onecrl.maximum_staleness_in_seconds", 108000);
 pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
 pref("extensions.blocklist.detailsURL", "https://blocked.cdn.mozilla.net/");
 pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
 // Controls what level the blocklist switches from warning about items to forcibly
 // blocking them.
--- a/toolkit/mozapps/extensions/Blocklist.jsm
+++ b/toolkit/mozapps/extensions/Blocklist.jsm
@@ -3234,13 +3234,13 @@ let Blocklist = {
     }
   },
 };
 
 XPCOMUtils.defineLazyPreferenceGetter(
   Blocklist,
   "useXML",
   "extensions.blocklist.useXML",
-  true,
+  false,
   () => Blocklist.onUpdateImplementation(true)
 );
 
 Blocklist._init();