Bug 1509411 - Remove the browser.contentblocking.(trackingprotection|rejecttrackers).ui.enabled prefs r=johannh
authorMichael Kohler <me@michaelkohler.info>
Mon, 26 Nov 2018 12:57:42 +0000
changeset 504401 703630d3fc2757d5aaa94ab706a5faf826b0b1c3
parent 504400 3c2cc6c7a72e8c9ab0adf9da2c265f815b3d659f
child 504402 ed995224a05aa692d3fc09b9ec82351894672c73
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1509411
milestone65.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 1509411 - Remove the browser.contentblocking.(trackingprotection|rejecttrackers).ui.enabled prefs r=johannh Differential Revision: https://phabricator.services.mozilla.com/D12819
browser/app/profile/firefox.js
browser/components/preferences/in-content/tests/browser_contentblocking.js
browser/components/preferences/in-content/tests/browser_spotlight.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1534,19 +1534,17 @@ pref("network.cookie.cookieBehavior", 4 
 pref("browser.contentblocking.allowlist.storage.enabled", true);
 
 #ifdef NIGHTLY_BUILD
 // Enable the Storage Access API in Nightly
 pref("dom.storage_access.enabled", true);
 #endif
 
 // Define a set of default features for the Content Blocking UI.
-pref("browser.contentblocking.trackingprotection.ui.enabled", true);
 pref("browser.contentblocking.trackingprotection.control-center.ui.enabled", true);
-pref("browser.contentblocking.rejecttrackers.ui.enabled", true);
 pref("browser.contentblocking.rejecttrackers.control-center.ui.enabled", true);
 
 // Enable the Report Breakage UI on Nightly and Beta but not on Release yet.
 #ifdef EARLY_BETA_OR_EARLIER
 pref("browser.contentblocking.reportBreakage.enabled", true);
 #else
 pref("browser.contentblocking.reportBreakage.enabled", false);
 #endif
--- a/browser/components/preferences/in-content/tests/browser_contentblocking.js
+++ b/browser/components/preferences/in-content/tests/browser_contentblocking.js
@@ -1,12 +1,10 @@
 /* eslint-env webextensions */
 
-const CB_TP_UI_PREF = "browser.contentblocking.trackingprotection.ui.enabled";
-const CB_RT_UI_PREF = "browser.contentblocking.rejecttrackers.ui.enabled";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TP_PBM_PREF = "privacy.trackingprotection.pbmode.enabled";
 const TP_LIST_PREF = "urlclassifier.trackingTable";
 const NCB_PREF = "network.cookie.cookieBehavior";
 const CAT_PREF = "browser.contentblocking.category";
 
 requestLongerTimeout(2);
 
@@ -250,18 +248,16 @@ function checkControlState(doc, controls
       }
     }
   }
 }
 
 // Checks that the menulists for tracking protection and cookie blocking are disabled when all TP prefs are off.
 add_task(async function testContentBlockingDependentTPControls() {
   SpecialPowers.pushPrefEnv({set: [
-    [CB_TP_UI_PREF, true],
-    [CB_RT_UI_PREF, true],
     [TP_PREF, false],
     [TP_PBM_PREF, false],
     [NCB_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT],
     [CAT_PREF, "custom"],
   ]});
 
   let disabledControls = [
     "#trackingProtectionMenu",
--- a/browser/components/preferences/in-content/tests/browser_spotlight.js
+++ b/browser/components/preferences/in-content/tests/browser_spotlight.js
@@ -46,20 +46,16 @@ add_task(async function test_form_autofi
   await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
     "Wait for the form-autofill section is spotlighted.");
   is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "form-autofill",
     "The form-autofill section is spotlighted.");
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
 
 add_task(async function test_change_cookie_settings() {
-  await SpecialPowers.pushPrefEnv({set: [
-    ["browser.contentblocking.trackingprotection.ui.enabled", true],
-    ["browser.contentblocking.rejecttrackers.ui.enabled", true],
-  ]});
   let prefs = await openPreferencesViaOpenPreferencesAPI("privacy-trackingprotection", {leaveOpen: true});
   is(prefs.selectedPane, "panePrivacy", "Privacy pane is selected by default");
   let doc = gBrowser.contentDocument;
   is(doc.location.hash, "#privacy", "The subcategory should be removed from the URI");
   await TestUtils.waitForCondition(() => doc.querySelector(".spotlight"),
     "Wait for the content-blocking section to be spotlighted.");
   is(doc.querySelector(".spotlight").getAttribute("data-subcategory"), "trackingprotection",
     "The tracking-protection section is spotlighted.");