From 0a021977b8215ce94f487736761bed745f9a96e2 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Sun, 4 Jan 2015 22:02:17 -0800
Subject: [PATCH] Bug 1117650 - Part 2 - Move all MixedContentBlocker tests
 into dom/security/test (r=tanvi)

--HG--
rename : dom/base/test/mixedcontentblocker/bug803225_test_mailto.html => dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html => dom/security/test/mixedcontentblocker/file_frameNavigation.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html => dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html => dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html => dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html => dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html => dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_main.html => dom/security/test/mixedcontentblocker/file_main.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html => dom/security/test/mixedcontentblocker/file_main_bug803225.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py => dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
rename : dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs => dom/security/test/mixedcontentblocker/file_server.sjs
rename : dom/base/test/mixedcontentblocker/mochitest.ini => dom/security/test/mixedcontentblocker/mochitest.ini
rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html => dom/security/test/mixedcontentblocker/test_bug803225.html
rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html => dom/security/test/mixedcontentblocker/test_frameNavigation.html
rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html => dom/security/test/mixedcontentblocker/test_main.html
---
 .../test/mixedcontentblocker/mochitest.ini    | 20 -------------------
 dom/base/test/moz.build                       |  1 -
 .../file_bug803225_test_mailto.html}          |  0
 .../file_frameNavigation.html}                |  6 +++---
 .../file_frameNavigation_blankTarget.html}    |  2 +-
 .../file_frameNavigation_grandchild.html}     |  4 ++--
 .../file_frameNavigation_innermost.html}      |  8 ++++----
 .../file_frameNavigation_secure.html}         |  6 +++---
 ...le_frameNavigation_secure_grandchild.html} |  4 ++--
 .../test/mixedcontentblocker/file_main.html}  |  2 +-
 .../file_main_bug803225.html}                 |  4 ++--
 .../file_main_bug803225_websocket_wsh.py}     |  0
 .../test/mixedcontentblocker/file_server.sjs} |  0
 .../test/mixedcontentblocker/mochitest.ini    | 20 +++++++++++++++++++
 .../mixedcontentblocker/test_bug803225.html}  |  4 ++--
 .../test_frameNavigation.html}                |  6 +++---
 .../test/mixedcontentblocker/test_main.html}  |  2 +-
 dom/security/test/moz.build                   |  1 +
 18 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 dom/base/test/mixedcontentblocker/mochitest.ini
 rename dom/{base/test/mixedcontentblocker/bug803225_test_mailto.html => security/test/mixedcontentblocker/file_bug803225_test_mailto.html} (100%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html => security/test/mixedcontentblocker/file_frameNavigation.html} (85%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html => security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html} (84%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html => security/test/mixedcontentblocker/file_frameNavigation_grandchild.html} (81%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html => security/test/mixedcontentblocker/file_frameNavigation_innermost.html} (76%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html => security/test/mixedcontentblocker/file_frameNavigation_secure.html} (84%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html => security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html} (84%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_main.html => security/test/mixedcontentblocker/file_main.html} (98%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html => security/test/mixedcontentblocker/file_main_bug803225.html} (96%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py => security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py} (100%)
 rename dom/{base/test/mixedcontentblocker/file_mixed_content_server.sjs => security/test/mixedcontentblocker/file_server.sjs} (100%)
 create mode 100644 dom/security/test/mixedcontentblocker/mochitest.ini
 rename dom/{base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html => security/test/mixedcontentblocker/test_bug803225.html} (95%)
 rename dom/{base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html => security/test/mixedcontentblocker/test_frameNavigation.html} (91%)
 rename dom/{base/test/mixedcontentblocker/test_mixed_content_blocker.html => security/test/mixedcontentblocker/test_main.html} (98%)

diff --git a/dom/base/test/mixedcontentblocker/mochitest.ini b/dom/base/test/mixedcontentblocker/mochitest.ini
deleted file mode 100644
index 82502b2976dc..000000000000
--- a/dom/base/test/mixedcontentblocker/mochitest.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[DEFAULT]
-support-files =
-  bug803225_test_mailto.html
-  file_mixed_content_frameNavigation.html
-  file_mixed_content_frameNavigation_blankTarget.html
-  file_mixed_content_frameNavigation_grandchild.html
-  file_mixed_content_frameNavigation_innermost.html
-  file_mixed_content_frameNavigation_secure.html
-  file_mixed_content_frameNavigation_secure_grandchild.html
-  file_mixed_content_main.html
-  file_mixed_content_main_bug803225.html
-  file_mixed_content_main_bug803225_websocket_wsh.py
-  file_mixed_content_server.sjs
-
-[test_mixed_content_blocker.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mixed_content_blocker_bug803225.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mixed_content_blocker_frameNavigation.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build
index d510421d738d..14d8f06d5ebe 100644
--- a/dom/base/test/moz.build
+++ b/dom/base/test/moz.build
@@ -17,7 +17,6 @@ GeckoCppUnitTests([
 
 MOCHITEST_MANIFESTS += [
     'chrome/mochitest.ini',
-    'mixedcontentblocker/mochitest.ini',
     'mochitest.ini',
     'websocket_hybi/mochitest.ini',
 ]
diff --git a/dom/base/test/mixedcontentblocker/bug803225_test_mailto.html b/dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
similarity index 100%
rename from dom/base/test/mixedcontentblocker/bug803225_test_mailto.html
rename to dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html b/dom/security/test/mixedcontentblocker/file_frameNavigation.html
similarity index 85%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation.html
index 36761cb190ca..fd9ea23178e1 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation.html
@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 <div id="testContent"></div>
 
 <script>
-  var baseUrlHttps = "https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html";
+  var baseUrlHttps = "https://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html";
 
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
   var MAX_COUNT = 50;
@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter_test1++;
       return;
     }
-    if (loc == "http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
+    if (loc == "http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
       return;
     }
     else {
@@ -63,7 +63,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 
   // Test 2: Navigate secure grandchild iframe to insecure grandchild iframe on a page that has no secure parents
   var iframe_test2 = document.createElement("iframe");
-  iframe_test2.src = "http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html"
+  iframe_test2.src = "http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html"
   iframe_test2.onerror = function() {
     parent.postMessage({"test": "insecurePage_navigate_grandchild", "msg": "got an on error alert when loading or navigating testing iframe"}, "http://mochi.test:8888");
   };
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html b/dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
similarity index 84%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
index 098fe66a66aa..5cfd95984156 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=841850
   <title>Tests for Mixed Content Frame Navigation</title>
 </head>
 <body>
-<a href="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?blankTarget" id="blankTarget" target="_blank">Go to http site</a>
+<a href="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?blankTarget" id="blankTarget" target="_blank">Go to http site</a>
 
 <script>
   var blankTarget = document.getElementById("blankTarget");
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html b/dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
similarity index 81%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
index 3e45093f9d94..c58f08eab290 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
   <title>Tests for Mixed Content Frame Navigation</title>
 </head>
 <body>
-<iframe src="https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild" id="child"></iframe>
+<iframe src="https://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?insecurePage_navigate_grandchild" id="child"></iframe>
 
 <script>
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter++;
       return;
     }
-    if (loc == "http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response") {
+    if (loc == "http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response") {
       return;
     }
     else {
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html b/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
similarity index 76%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
index 782eadac6861..56879b11118f 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
@@ -9,7 +9,7 @@
   switch (type) {
     case "insecurePage_navigate_child":
       document.getElementById("content").innerHTML =
-        '<a href="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?insecurePage_navigate_child_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
@@ -20,7 +20,7 @@
 
     case "insecurePage_navigate_grandchild":
       document.getElementById("content").innerHTML =
-        '<a href="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
@@ -31,7 +31,7 @@
 
     case "securePage_navigate_child":
       document.getElementById("content").innerHTML =
-        '<a href="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_child_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?securePage_navigate_child_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
@@ -42,7 +42,7 @@
 
     case "securePage_navigate_grandchild":
       document.getElementById("content").innerHTML=
-        '<a href="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?securePage_navigate_grandchild_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html b/dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
similarity index 84%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
index 7cce06584454..ea8462c391a4 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 <div id="testContent"></div>
 
 <script>
-  var baseUrl = "https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html";
+  var baseUrl = "https://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html";
 
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
   var MAX_COUNT = 50;
@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter_test1++;
       return;
     }
-    if (loc == "http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
+    if (loc == "http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
       return;
     } else {
       if(counter_test1 < MAX_COUNT) {
@@ -62,7 +62,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 
   // Test 2: Open an http page in a new tab from a link click with target=_blank.
   var iframe_test3 = document.createElement("iframe");
-  iframe_test3.src = "https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html";
+  iframe_test3.src = "https://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html";
   iframe_test3.onerror = function() {
     parent.postMessage({"test": "blankTarget", "msg": "got an onerror event when loading or navigating testing iframe"}, "http://mochi.test:8888");
   };
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html b/dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
similarity index 84%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
index 5fc2ad7d7fc3..f7f3c40862c7 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 </head>
 <body>
 
-<iframe src="https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild" id="child"></iframe>
+<iframe src="https://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?securePage_navigate_grandchild" id="child"></iframe>
 <script>
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
   var MAX_COUNT = 50;
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter++;
       return;
     }
-    if (loc == "http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild_response") {
+    if (loc == "http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html?securePage_navigate_grandchild_response") {
       return;
     }
     else {
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_main.html b/dom/security/test/mixedcontentblocker/file_main.html
similarity index 98%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_main.html
rename to dom/security/test/mixedcontentblocker/file_main.html
index 4963a5a14e96..4003ccb05527 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_main.html
+++ b/dom/security/test/mixedcontentblocker/file_main.html
@@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=62178
 -->
 
 <script>
-  var baseUrl = "http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs";
+  var baseUrl = "http://example.com/tests/dom/security/test/mixedcontentblocker/file_server.sjs";
 
   //For tests that require setTimeout, set the maximum polling time to 100 x 100ms = 10 seconds.
   var MAX_COUNT = 100;
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html b/dom/security/test/mixedcontentblocker/file_main_bug803225.html
similarity index 96%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
rename to dom/security/test/mixedcontentblocker/file_main_bug803225.html
index ec2d5582f860..d20791add7d3 100644
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
+++ b/dom/security/test/mixedcontentblocker/file_main_bug803225.html
@@ -112,7 +112,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
   var webHandler = SpecialPowers.Cc["@mozilla.org/uriloader/web-handler-app;1"].
                    createInstance(SpecialPowers.Ci.nsIWebHandlerApp);
   webHandler.name = "Web Handler";
-  webHandler.uriTemplate = "http://example.com/tests/dom/base/test/mixedcontentblocker/bug803225_test_mailto.html?s=%";
+  webHandler.uriTemplate = "http://example.com/tests/dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html?s=%";
 
   var uri = ioService.newURI("mailto:foo@bar.com", null, null);
   webHandler.launchWithURI(uri);
@@ -144,7 +144,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
 
   // Test 8: wss protocol
   var wss;
-  wss = new WebSocket("wss://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket");
+  wss = new WebSocket("wss://example.com/tests/dom/security/test/mixedcontentblocker/file_main_bug803225_websocket");
 
   var status_wss = "started";
   wss.onopen = function(e) {
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py b/dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
similarity index 100%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py
rename to dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs b/dom/security/test/mixedcontentblocker/file_server.sjs
similarity index 100%
rename from dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs
rename to dom/security/test/mixedcontentblocker/file_server.sjs
diff --git a/dom/security/test/mixedcontentblocker/mochitest.ini b/dom/security/test/mixedcontentblocker/mochitest.ini
new file mode 100644
index 000000000000..2e001180488e
--- /dev/null
+++ b/dom/security/test/mixedcontentblocker/mochitest.ini
@@ -0,0 +1,20 @@
+[DEFAULT]
+support-files =
+  file_bug803225_test_mailto.html
+  file_frameNavigation.html
+  file_frameNavigation_blankTarget.html
+  file_frameNavigation_grandchild.html
+  file_frameNavigation_innermost.html
+  file_frameNavigation_secure.html
+  file_frameNavigation_secure_grandchild.html
+  file_main.html
+  file_main_bug803225.html
+  file_main_bug803225_websocket_wsh.py
+  file_server.sjs
+
+[test_main.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
+[test_bug803225.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
+[test_frameNavigation.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
diff --git a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html b/dom/security/test/mixedcontentblocker/test_bug803225.html
similarity index 95%
rename from dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
rename to dom/security/test/mixedcontentblocker/test_bug803225.html
index 042702584efc..9b6f6af6ca9a 100644
--- a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
+++ b/dom/security/test/mixedcontentblocker/test_bug803225.html
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
       changePrefs(counter);
       counter++;
       log("\nblockDisplay set to "+blockDisplay+", blockActive set to "+blockActive+".");
-      document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html"></iframe>';
+      document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/dom/security/test/mixedcontentblocker/file_main_bug803225.html"></iframe>';
     }
     else {
       //set the prefs back to what they were set to originally
@@ -141,7 +141,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
 
 <body>
   <div id="framediv">
-    <iframe id="testHarness" src="https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html"></iframe>
+    <iframe id="testHarness" src="https://example.com/tests/dom/security/test/mixedcontentblocker/file_main_bug803225.html"></iframe>
   </div>
   <pre id="log"></pre>
 </body>
diff --git a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html b/dom/security/test/mixedcontentblocker/test_frameNavigation.html
similarity index 91%
rename from dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
rename to dom/security/test/mixedcontentblocker/test_frameNavigation.html
index 5eb5b828cab4..3ee7b3876515 100644
--- a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
+++ b/dom/security/test/mixedcontentblocker/test_frameNavigation.html
@@ -42,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
     // If we are here, all the insecure tests have run.
     // If we haven't changed the iframe to run the secure tests, change it now.
     if (!secureTestsStarted) {
-      document.getElementById('testing_frame').src = "https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html";
+      document.getElementById('testing_frame').src = "https://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html";
       secureTestsStarted = true;
     }
     for (var prop in testsToRunSecure) {
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       blockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
       log("blockActive set to "+blockActive+".");
       secureTestsStarted = false;
-      document.getElementById('framediv').innerHTML = '<iframe src="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html" id="testing_frame"></iframe>';
+      document.getElementById('framediv').innerHTML = '<iframe src="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation.html" id="testing_frame"></iframe>';
     }
     else {
       //set the prefs back to what they were set to originally
@@ -119,7 +119,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 
 <body>
   <div id="framediv">
-    <iframe src="http://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html" id="testing_frame"></iframe>
+    <iframe src="http://example.com/tests/dom/security/test/mixedcontentblocker/file_frameNavigation.html" id="testing_frame"></iframe>
   </div>
 
   <pre id="log"></pre>
diff --git a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html b/dom/security/test/mixedcontentblocker/test_main.html
similarity index 98%
rename from dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
rename to dom/security/test/mixedcontentblocker/test_main.html
index 37c4fc6e33de..1ccbfe57d926 100644
--- a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
+++ b/dom/security/test/mixedcontentblocker/test_main.html
@@ -62,7 +62,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=62178
   }
 
   function reloadFrame() {
-    document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/dom/base/test/mixedcontentblocker/file_mixed_content_main.html"></iframe>';
+    document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/dom/security/test/mixedcontentblocker/file_main.html"></iframe>';
   }
 
   function checkTestsCompleted() {
diff --git a/dom/security/test/moz.build b/dom/security/test/moz.build
index 4ef9de3762b6..8f2441d8c7ce 100644
--- a/dom/security/test/moz.build
+++ b/dom/security/test/moz.build
@@ -14,6 +14,7 @@ GeckoCppUnitTests([
 
 MOCHITEST_MANIFESTS += [
     'csp/mochitest.ini',
+    'mixedcontentblocker/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [