1 files changed, 0 insertions, 187 deletions
diff --git a/browser/base/content/test/general/browser_bug822367.js b/browser/base/content/test/general/browser_bug822367.js
deleted file mode 100644
index 0d60c05cd1..0000000000
--- a/browser/base/content/test/general/browser_bug822367.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * User Override Mixed Content Block - Tests for Bug 822367
- */
-
-
-const PREF_DISPLAY = "security.mixed_content.block_display_content";
-const PREF_ACTIVE = "security.mixed_content.block_active_content";
-
-// We alternate for even and odd test cases to simulate different hosts
-const gHttpTestRoot = "https://example.com/browser/browser/base/content/test/general/";
-const gHttpTestRoot2 = "https://test1.example.com/browser/browser/base/content/test/general/";
-
-var gTestBrowser = null;
-
-add_task(function* test() {
-  yield SpecialPowers.pushPrefEnv({ set: [[ PREF_DISPLAY, true ],
-                                          [ PREF_ACTIVE, true  ]] });
-
-  var newTab = gBrowser.addTab();
-  gBrowser.selectedTab = newTab;
-  gTestBrowser = gBrowser.selectedBrowser;
-  newTab.linkedBrowser.stop()
-
-  // Mixed Script Test
-  var url = gHttpTestRoot + "file_bug822367_1.html";
-  BrowserTestUtils.loadURI(gTestBrowser, url);
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-// Mixed Script Test
-add_task(function* MixedTest1A() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
-
-  let {gIdentityHandler} = gTestBrowser.ownerGlobal;
-  gIdentityHandler.disableMixedContentProtection();
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest1B() {
-  yield ContentTask.spawn(gTestBrowser, null, function* () {
-    yield ContentTaskUtils.waitForCondition(
-      () => content.document.getElementById("p1").innerHTML == "hello",
-      "Waited too long for mixed script to run in Test 1");
-  });
-});
-
-// Mixed Display Test - Doorhanger should not appear
-add_task(function* MixedTest2() {
-  var url = gHttpTestRoot2 + "file_bug822367_2.html";
-  BrowserTestUtils.loadURI(gTestBrowser, url);
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: false, passiveLoaded: false});
-});
-
-// Mixed Script and Display Test - User Override should cause both the script and the image to load.
-add_task(function* MixedTest3() {
-  var url = gHttpTestRoot + "file_bug822367_3.html";
-  BrowserTestUtils.loadURI(gTestBrowser, url);
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest3A() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
-
-  let {gIdentityHandler} = gTestBrowser.ownerGlobal;
-  gIdentityHandler.disableMixedContentProtection();
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest3B() {
-  yield ContentTask.spawn(gTestBrowser, null, function* () {
-    let p1 = ContentTaskUtils.waitForCondition(
-      () => content.document.getElementById("p1").innerHTML == "hello",
-      "Waited too long for mixed script to run in Test 3");
-    let p2 = ContentTaskUtils.waitForCondition(
-      () => content.document.getElementById("p2").innerHTML == "bye",
-      "Waited too long for mixed image to load in Test 3");
-    yield Promise.all([ p1, p2 ]);
-  });
-
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: true, activeBlocked: false, passiveLoaded: true});
-});
-
-// Location change - User override on one page doesn't propogate to another page after location change.
-add_task(function* MixedTest4() {
-  var url = gHttpTestRoot2 + "file_bug822367_4.html";
-  BrowserTestUtils.loadURI(gTestBrowser, url);
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest4A() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
-
-  let {gIdentityHandler} = gTestBrowser.ownerGlobal;
-  gIdentityHandler.disableMixedContentProtection();
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest4B() {
-  let url = gHttpTestRoot + "file_bug822367_4B.html";
-  yield ContentTask.spawn(gTestBrowser, url, function* (wantedUrl) {
-    yield ContentTaskUtils.waitForCondition(
-      () => content.document.location == wantedUrl,
-      "Waited too long for mixed script to run in Test 4");
-  });
-});
-
-add_task(function* MixedTest4C() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
-
-  yield ContentTask.spawn(gTestBrowser, null, function* () {
-    yield ContentTaskUtils.waitForCondition(
-      () => content.document.getElementById("p1").innerHTML == "",
-      "Mixed script loaded in test 4 after location change!");
-  });
-});
-
-// Mixed script attempts to load in a document.open()
-add_task(function* MixedTest5() {
-  var url = gHttpTestRoot + "file_bug822367_5.html";
-  BrowserTestUtils.loadURI(gTestBrowser, url);
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest5A() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
-
-  let {gIdentityHandler} = gTestBrowser.ownerGlobal;
-  gIdentityHandler.disableMixedContentProtection();
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest5B() {
-  yield ContentTask.spawn(gTestBrowser, null, function* () {
-    yield ContentTaskUtils.waitForCondition(
-      () => content.document.getElementById("p1").innerHTML == "hello",
-      "Waited too long for mixed script to run in Test 5");
-  });
-});
-
-// Mixed script attempts to load in a document.open() that is within an iframe.
-add_task(function* MixedTest6() {
-  var url = gHttpTestRoot2 + "file_bug822367_6.html";
-  BrowserTestUtils.loadURI(gTestBrowser, url);
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest6A() {
-  gTestBrowser.removeEventListener("load", MixedTest6A, true);
-  let {gIdentityHandler} = gTestBrowser.ownerGlobal;
-
-  yield BrowserTestUtils.waitForCondition(
-    () => gIdentityHandler._identityBox.classList.contains("mixedActiveBlocked"),
-    "Waited too long for control center to get mixed active blocked state");
-});
-
-add_task(function* MixedTest6B() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
-
-  let {gIdentityHandler} = gTestBrowser.ownerGlobal;
-  gIdentityHandler.disableMixedContentProtection();
-
-  yield BrowserTestUtils.browserLoaded(gTestBrowser);
-});
-
-add_task(function* MixedTest6C() {
-  yield ContentTask.spawn(gTestBrowser, null, function* () {
-    function test() {
-      try {
-        return content.document.getElementById("f1").contentDocument.getElementById("p1").innerHTML == "hello";
-      } catch (e) {
-        return false;
-      }
-    }
-
-    yield ContentTaskUtils.waitForCondition(test, "Waited too long for mixed script to run in Test 6");
-  });
-});
-
-add_task(function* MixedTest6D() {
-  assertMixedContentBlockingState(gTestBrowser, {activeLoaded: true, activeBlocked: false, passiveLoaded: false});
-});
-
-add_task(function* cleanup() {
-  gBrowser.removeCurrentTab();
-});