Backed out changeset a27b5825884b (bug 1525856) as per eakhgari request. CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Thu, 28 Feb 2019 22:23:54 +0200
changeset 519672 ef8953aa920da752e3e11346fdd3f27ef4bb1800
parent 519671 1a272d807e843449f87c661ec31c0a3000a74d8f
child 519673 888a99e562a7cb1e0280cfc6646b25e8bfd5b629
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1525856
milestone67.0a1
backs outa27b5825884bd750be974a963caa7ccb74d781e4
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
Backed out changeset a27b5825884b (bug 1525856) as per eakhgari request. CLOSED TREE
browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
@@ -16,57 +16,39 @@ add_task(async function setup() {
     [ "privacy.trackingprotection.fingerprinting.enabled", false ],
   ]});
 });
 
 async function testIdentityState(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   ok(!ContentBlocking.content.hasAttribute("detected"), "cryptominers are not detected");
   ok(BrowserTestUtils.is_hidden(ContentBlocking.iconBox), "icon box is not visible");
 
   promise = waitForContentBlockingEvent();
 
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("cryptomining", "*");
   });
 
   await promise;
 
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
   is(ContentBlocking.iconBox.hasAttribute("hasException"), hasException,
     "Shows an exception when appropriate");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 async function testSubview(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   promise = waitForContentBlockingEvent();
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("cryptomining", "*");
   });
   await promise;
 
   await openIdentityPopup();
 
@@ -89,29 +71,31 @@ async function testSubview(hasException)
   let mainView = document.getElementById("identity-popup-mainView");
   viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
   let backButton = subview.querySelector(".subviewbutton-back");
   backButton.click();
   await viewShown;
 
   ok(true, "Main view was shown");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 add_task(async function test() {
+  let uri = Services.io.newURI("https://example.org");
+
   Services.prefs.setBoolPref(CM_PREF, true);
 
   await testIdentityState(false);
-  await testIdentityState(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testIdentityState(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   await testSubview(false);
-  await testSubview(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testSubview(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   Services.prefs.clearUserPref(CM_PREF);
 });
 
--- a/browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
@@ -16,57 +16,39 @@ add_task(async function setup() {
     [ "privacy.trackingprotection.cryptomining.enabled", false ],
   ]});
 });
 
 async function testIdentityState(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   ok(!ContentBlocking.content.hasAttribute("detected"), "fingerprinters are not detected");
   ok(BrowserTestUtils.is_hidden(ContentBlocking.iconBox), "icon box is not visible");
 
   promise = waitForContentBlockingEvent();
 
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("fingerprinting", "*");
   });
 
   await promise;
 
   ok(ContentBlocking.content.hasAttribute("detected"), "trackers are detected");
   ok(BrowserTestUtils.is_visible(ContentBlocking.iconBox), "icon box is visible");
   is(ContentBlocking.iconBox.hasAttribute("hasException"), hasException,
     "Shows an exception when appropriate");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 async function testSubview(hasException) {
   let promise = BrowserTestUtils.openNewForegroundTab({url: TRACKING_PAGE, gBrowser});
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.disableForCurrentPage();
-    await loaded;
-  }
-
   promise = waitForContentBlockingEvent();
   await ContentTask.spawn(tab.linkedBrowser, {}, function() {
     content.postMessage("fingerprinting", "*");
   });
   await promise;
 
   await openIdentityPopup();
 
@@ -89,29 +71,31 @@ async function testSubview(hasException)
   let mainView = document.getElementById("identity-popup-mainView");
   viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
   let backButton = subview.querySelector(".subviewbutton-back");
   backButton.click();
   await viewShown;
 
   ok(true, "Main view was shown");
 
-  if (hasException) {
-    let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, TRACKING_PAGE);
-    ContentBlocking.enableForCurrentPage();
-    await loaded;
-  }
-
   BrowserTestUtils.removeTab(tab);
 }
 
 add_task(async function test() {
+  let uri = Services.io.newURI("https://example.org");
+
   Services.prefs.setBoolPref(FP_PREF, true);
 
   await testIdentityState(false);
-  await testIdentityState(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testIdentityState(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   await testSubview(false);
-  await testSubview(true);
+  Services.perms.add(uri, "trackingprotection", Services.perms.ALLOW_ACTION);
+  // TODO: This currently fails because of bug 1525458, fixing should allow us to re-enable it.
+  // await testSubview(true);
+  Services.perms.remove(uri, "trackingprotection");
 
   Services.prefs.clearUserPref(FP_PREF);
 });