diff --git a/toolkit/components/antitracking/test/browser/browser.ini b/toolkit/components/antitracking/test/browser/browser.ini index 267d66b99a41..4d1b55bf06a4 100644 --- a/toolkit/components/antitracking/test/browser/browser.ini +++ b/toolkit/components/antitracking/test/browser/browser.ini @@ -28,32 +28,16 @@ skip-if = (os == "win" && os_version == "6.1" && bits == 32 && !debug) # Bug 149 [browser_imageCache1.js] [browser_imageCache1-1.js] [browser_imageCache1-2.js] -[browser_imageCache2.js] -[browser_imageCache2-1.js] -[browser_imageCache2-2.js] [browser_imageCache4.js] [browser_imageCache4-1.js] [browser_imageCache4-2.js] -[browser_imageCache5.js] -[browser_imageCache5-1.js] -[browser_imageCache5-2.js] -[browser_imageCache6-1.js] -[browser_imageCache6-2.js] -[browser_imageCache6.js] [browser_imageCache8.js] -[browser_imageCache9.js] [browser_imageCache10.js] [browser_imageCache10-1.js] [browser_imageCache10-2.js] -[browser_imageCache11.js] -[browser_imageCache11-1.js] -[browser_imageCache11-2.js] [browser_imageCache13.js] [browser_imageCache13-1.js] [browser_imageCache13-2.js] -[browser_imageCache14.js] -[browser_imageCache14-1.js] -[browser_imageCache14-2.js] [browser_onBeforeRequestNotificationForTrackingResources.js] [browser_onModifyRequestNotificationForTrackingResources.js] [browser_permissionInNormalWindows.js] diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache1-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache1-1.js index 9210ce3615f7..19eab7e90017 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache1-1.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache1-1.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = true; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache1-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache1-2.js index 36ed0ee7e4f6..8c9e08f38861 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache1-2.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache1-2.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = false; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache1.js b/toolkit/components/antitracking/test/browser/browser_imageCache1.js index 3f610342bbc7..77d0508936c9 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache1.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache1.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = true; let blockingByAllowList = false; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache10-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache10-1.js index 71d23af2bac1..e965d1739dec 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache10-1.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache10-1.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = true; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache10-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache10-2.js index 3ca9b23e4fc3..74532b917750 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache10-2.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache10-2.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = false; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache10.js b/toolkit/components/antitracking/test/browser/browser_imageCache10.js index ff2a161b0126..687683e81c61 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache10.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache10.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = true; let blockingByAllowList = false; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache11-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache11-1.js deleted file mode 100644 index edacdff8a5a3..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache11-1.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = true; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache11-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache11-2.js deleted file mode 100644 index 203de4a1c2ca..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache11-2.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache11.js b/toolkit/components/antitracking/test/browser/browser_imageCache11.js deleted file mode 100644 index 7192d462c3fc..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache11.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = true; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache13-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache13-1.js index 82f52261811c..3a46c8ba4ef5 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache13-1.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache13-1.js @@ -6,7 +6,6 @@ Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = true; let expectedBlockingNotifications = false; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache13-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache13-2.js index 8cd8d63ac2a5..6dc86a5f890c 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache13-2.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache13-2.js @@ -6,7 +6,6 @@ Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = false; let expectedBlockingNotifications = false; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache13.js b/toolkit/components/antitracking/test/browser/browser_imageCache13.js index 472949db523d..1a6dfeb15465 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache13.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache13.js @@ -6,7 +6,6 @@ Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = true; let blockingByAllowList = false; let expectedBlockingNotifications = false; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache14-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache14-1.js deleted file mode 100644 index 40cab7ccaffb..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache14-1.js +++ /dev/null @@ -1,21 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -/* Setting a custom permission for this website */ -let uriObj = Services.io.newURI(TEST_DOMAIN); -Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = true; -let expectedBlockingNotifications = false; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache14-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache14-2.js deleted file mode 100644 index 084ce048b01c..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache14-2.js +++ /dev/null @@ -1,21 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -/* Setting a custom permission for this website */ -let uriObj = Services.io.newURI(TEST_DOMAIN); -Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = false; -let expectedBlockingNotifications = false; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache14.js b/toolkit/components/antitracking/test/browser/browser_imageCache14.js deleted file mode 100644 index 9b058c92cdb4..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache14.js +++ /dev/null @@ -1,21 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -/* Setting a custom permission for this website */ -let uriObj = Services.io.newURI(TEST_DOMAIN); -Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = true; -let blockingByAllowList = false; -let expectedBlockingNotifications = false; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache2-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache2-1.js deleted file mode 100644 index d81f1608fbd5..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache2-1.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = true; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache2-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache2-2.js deleted file mode 100644 index 720982c44796..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache2-2.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache2.js b/toolkit/components/antitracking/test/browser/browser_imageCache2.js deleted file mode 100644 index 519c9c55ca29..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache2.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = true; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache4-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache4-1.js index 93695508b234..61eeebf89609 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache4-1.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache4-1.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = true; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = true; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache4-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache4-2.js index 27c388f8898c..19794fb78cb5 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache4-2.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache4-2.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = true; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = false; let blockingByAllowList = false; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache4.js b/toolkit/components/antitracking/test/browser/browser_imageCache4.js index 9bfeca3c4352..60040cdd2f8f 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache4.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache4.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = true; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = true; let blockingByAllowList = false; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache5-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache5-1.js deleted file mode 100644 index 9210ce3615f7..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache5-1.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = true; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache5-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache5-2.js deleted file mode 100644 index 36ed0ee7e4f6..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache5-2.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache5.js b/toolkit/components/antitracking/test/browser/browser_imageCache5.js deleted file mode 100644 index 3f610342bbc7..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache5.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = false; -let blockingByContentBlockingUI = true; -let blockingByContentBlockingRTUI = true; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache6-1.js b/toolkit/components/antitracking/test/browser/browser_imageCache6-1.js deleted file mode 100644 index d81f1608fbd5..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache6-1.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = true; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache6-2.js b/toolkit/components/antitracking/test/browser/browser_imageCache6-2.js deleted file mode 100644 index 720982c44796..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache6-2.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = false; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache6.js b/toolkit/components/antitracking/test/browser/browser_imageCache6.js deleted file mode 100644 index 519c9c55ca29..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache6.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_TRACKER; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = false; -let blockingByContentBlockingRTUI = true; -let blockingByAllowList = false; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache8.js b/toolkit/components/antitracking/test/browser/browser_imageCache8.js index c7956313a269..4178078a2b80 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache8.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache8.js @@ -2,7 +2,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = true; -let blockingByContentBlockingUI = true; let blockingByContentBlockingRTUI = true; let blockingByAllowList = true; let expectedBlockingNotifications = true; diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache9.js b/toolkit/components/antitracking/test/browser/browser_imageCache9.js deleted file mode 100644 index c70eecb2a27a..000000000000 --- a/toolkit/components/antitracking/test/browser/browser_imageCache9.js +++ /dev/null @@ -1,18 +0,0 @@ -ChromeUtils.import("resource://gre/modules/Services.jsm"); - -let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; -let blockingByContentBlocking = true; -let blockingByContentBlockingUI = true; -let blockingByContentBlockingRTUI = true; -let blockingByAllowList = true; -let expectedBlockingNotifications = true; - -let rootDir = getRootDirectory(gTestPath); -let jar = getJar(rootDir); -if (jar) { - let tmpdir = extractJarToTmp(jar); - rootDir = "file://" + tmpdir.path + "/"; -} -/* import-globals-from imageCacheWorker.js */ -Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); - diff --git a/toolkit/components/antitracking/test/browser/head.js b/toolkit/components/antitracking/test/browser/head.js index 3555bf22407c..536b1d6b7db2 100644 --- a/toolkit/components/antitracking/test/browser/head.js +++ b/toolkit/components/antitracking/test/browser/head.js @@ -31,7 +31,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: true, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: false, callback: callbackTracking, @@ -46,7 +45,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: true, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: false, allowList: true, callback: callbackTracking, @@ -74,12 +72,6 @@ this.AntiTracking = { } else { options.blockingByContentBlocking = false; } - if ("blockingByContentBlockingUI" in callbackNonTracking) { - options.blockingByContentBlockingUI = - callbackNonTracking.blockingByContentBlockingUI; - } else { - options.blockingByContentBlockingUI = false; - } if ("blockingByContentBlockingRTUI" in callbackNonTracking) { options.blockingByContentBlockingRTUI = callbackNonTracking.blockingByContentBlockingRTUI; @@ -97,10 +89,9 @@ this.AntiTracking = { // Phase 1: Here we want to test that a 3rd party context is not blocked if pref is off. if (runExtraTests) { - // There are six ways in which the third-party context may not be blocked: + // There are five ways in which the third-party context may not be blocked: // * If the cookieBehavior pref causes it to not be blocked. // * If the contentBlocking pref causes it to not be blocked. - // * If the contentBlocking UI pref causes it to not be blocked. // * If both of these prefs cause it to not be blocked. // * If the top-level page is on the content blocking allow list. // * If the contentBlocking third-party cookies UI pref is off, the allow list will be ignored. @@ -109,7 +100,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_ACCEPT, blockingByContentBlocking: true, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: false, callback: callbackNonTracking, @@ -124,7 +114,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_ACCEPT, blockingByContentBlocking: true, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: false, allowList: true, callback: callbackNonTracking, @@ -139,7 +128,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_ACCEPT, blockingByContentBlocking: true, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: false, allowList: false, callback: callbackNonTracking, @@ -154,7 +142,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_ACCEPT, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: false, callback: callbackNonTracking, @@ -169,7 +156,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_ACCEPT, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: false, allowList: true, callback: callbackNonTracking, @@ -184,52 +170,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_ACCEPT, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, - blockingByContentBlockingRTUI: false, - allowList: false, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_ACCEPT, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: true, - allowList: false, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_ACCEPT, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: false, - allowList: true, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_ACCEPT, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, blockingByContentBlockingRTUI: false, allowList: false, callback: callbackNonTracking, @@ -244,7 +184,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_FOREIGN, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: false, callback: callbackNonTracking, @@ -259,7 +198,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_FOREIGN, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: false, allowList: true, callback: callbackNonTracking, @@ -274,52 +212,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_FOREIGN, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, - blockingByContentBlockingRTUI: false, - allowList: false, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_FOREIGN, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: true, - allowList: false, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_FOREIGN, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: false, - allowList: true, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_FOREIGN, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, blockingByContentBlockingRTUI: false, allowList: false, callback: callbackNonTracking, @@ -334,7 +226,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_FOREIGN, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: true, callback: callbackNonTracking, @@ -349,22 +240,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_FOREIGN, blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: true, - allowList: true, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_FOREIGN, - blockingByContentBlocking: true, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: true, callback: callbackNonTracking, @@ -379,7 +254,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: false, callback: callbackNonTracking, @@ -394,7 +268,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: false, allowList: true, callback: callbackNonTracking, @@ -409,52 +282,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, - blockingByContentBlockingRTUI: false, - allowList: false, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_TRACKER, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: true, - allowList: false, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_TRACKER, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, - blockingByContentBlockingRTUI: false, - allowList: true, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_TRACKER, - blockingByContentBlocking: true, - blockingByContentBlockingUI: false, blockingByContentBlockingRTUI: false, allowList: false, callback: callbackNonTracking, @@ -469,7 +296,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: false, - blockingByContentBlockingUI: true, blockingByContentBlockingRTUI: true, allowList: true, callback: callbackNonTracking, @@ -484,7 +310,6 @@ this.AntiTracking = { name, cookieBehavior: BEHAVIOR_REJECT_TRACKER, blockingByContentBlocking: true, - blockingByContentBlockingUI: false, blockingByContentBlockingRTUI: true, allowList: true, callback: callbackNonTracking, @@ -494,29 +319,12 @@ this.AntiTracking = { iframeSandbox, }); this._createCleanupTask(cleanupFunction); - - this._createTask({ - name, - cookieBehavior: BEHAVIOR_REJECT_TRACKER, - blockingByContentBlocking: true, - blockingByContentBlockingUI: true, - blockingByContentBlockingRTUI: true, - allowList: true, - callback: callbackNonTracking, - extraPrefs: [], - expectedBlockingNotifications: false, - runInPrivateWindow, - iframeSandbox, - }); - this._createCleanupTask(cleanupFunction); - } else if (!options.blockingByContentBlocking || - !options.blockingByContentBlockingUI) { + } else if (!options.blockingByContentBlocking) { // Don't run this extra test if we are in blocking mode! this._createTask({ name, cookieBehavior: options.cookieBehavior, blockingByContentBlocking: options.blockingByContentBlocking, - blockingByContentBlockingUI: options.blockingByContentBlockingUI, blockingByContentBlockingRTUI: options.blockingByContentBlockingRTUI, allowList: options.blockingByAllowList, callback: callbackNonTracking, @@ -548,14 +356,14 @@ this.AntiTracking = { }, async _setupTest(win, cookieBehavior, blockingByContentBlocking, - blockingByContentBlockingUI, blockingByContentBlockingRTUI, + blockingByContentBlockingRTUI, extraPrefs) { await SpecialPowers.flushPrefEnv(); await SpecialPowers.pushPrefEnv({"set": [ ["dom.storage_access.enabled", true], ["browser.contentblocking.allowlist.annotations.enabled", blockingByContentBlockingRTUI], ["browser.contentblocking.allowlist.storage.enabled", blockingByContentBlockingRTUI], - ["browser.contentblocking.enabled", blockingByContentBlocking && blockingByContentBlockingUI], + ["browser.contentblocking.enabled", blockingByContentBlocking], ["network.cookie.cookieBehavior", cookieBehavior], ["privacy.trackingprotection.enabled", false], ["privacy.trackingprotection.pbmode.enabled", false], @@ -575,7 +383,6 @@ this.AntiTracking = { add_task(async function() { info("Starting " + (options.cookieBehavior != BEHAVIOR_ACCEPT ? "blocking" : "non-blocking") + " cookieBehavior (" + options.cookieBehavior + ") and " + (options.blockingByContentBlocking ? "blocking" : "non-blocking") + " contentBlocking and " + - (options.blockingByContentBlockingUI ? "" : "no") + " contentBlocking UI and " + (options.blockingByContentBlockingRTUI ? "" : "no") + " contentBlocking third-party cookies UI with" + (options.allowList ? "" : "out") + " allow list test " + options.name + " running in a " + (options.runInPrivateWindow ? "private" : "normal") + " window " + @@ -589,7 +396,6 @@ this.AntiTracking = { await AntiTracking._setupTest(win, options.cookieBehavior, options.blockingByContentBlocking, - options.blockingByContentBlockingUI, options.blockingByContentBlockingRTUI, options.extraPrefs); diff --git a/toolkit/components/antitracking/test/browser/imageCacheWorker.js b/toolkit/components/antitracking/test/browser/imageCacheWorker.js index d72efffe76de..2c575c0d91a1 100644 --- a/toolkit/components/antitracking/test/browser/imageCacheWorker.js +++ b/toolkit/components/antitracking/test/browser/imageCacheWorker.js @@ -24,7 +24,6 @@ AntiTracking.runTest("Image cache - should load the image three times.", runExtraTests: false, cookieBehavior, blockingByContentBlocking, - blockingByContentBlockingUI, blockingByContentBlockingRTUI, blockingByAllowList, callback: async _ => { @@ -51,7 +50,7 @@ AntiTracking.runTest("Image cache - should load the image three times.", // If we didn't run the non-blocking test, only expect to have seen two images. // Otherwise, expect to have seen three images. -let expected = (blockingByContentBlocking && blockingByContentBlockingUI) ? 2 : 3; +let expected = blockingByContentBlocking ? 2 : 3; // We still want to see just expected requests. add_task(async _ => {