Bug 1117650 - Part 2 - Move all MixedContentBlocker tests into dom/security/test (r=tanvi)
☠☠ backed out by 218c8f17c77f ☠ ☠
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Sun, 04 Jan 2015 22:02:17 -0800
changeset 251961 eef01ed4d40606a4e196f624c0f8b481673ed647
parent 251960 1b25392be437881bb429db0328232db3f63e5557
child 251962 aff44058c7992c1075b8e865e08d60ff30f62348
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstanvi
bugs1117650
milestone38.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 1117650 - Part 2 - Move all MixedContentBlocker tests into dom/security/test (r=tanvi)
dom/base/test/mixedcontentblocker/bug803225_test_mailto.html
dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
dom/base/test/mixedcontentblocker/file_mixed_content_main.html
dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py
dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs
dom/base/test/mixedcontentblocker/mochitest.ini
dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
dom/base/test/moz.build
dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
dom/security/test/mixedcontentblocker/file_frameNavigation.html
dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
dom/security/test/mixedcontentblocker/file_main.html
dom/security/test/mixedcontentblocker/file_main_bug803225.html
dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
dom/security/test/mixedcontentblocker/file_server.sjs
dom/security/test/mixedcontentblocker/mochitest.ini
dom/security/test/mixedcontentblocker/test_bug803225.html
dom/security/test/mixedcontentblocker/test_frameNavigation.html
dom/security/test/mixedcontentblocker/test_main.html
dom/security/test/moz.build
--- a/dom/base/test/moz.build
+++ b/dom/base/test/moz.build
@@ -12,17 +12,16 @@ XPCSHELL_TESTS_MANIFESTS += [
 GeckoCppUnitTests([
     'TestGetURL',
     'TestNativeXMLHttpRequest',
     'TestPlainTextSerializer',
 ])
 
 MOCHITEST_MANIFESTS += [
     'chrome/mochitest.ini',
-    'mixedcontentblocker/mochitest.ini',
     'mochitest.ini',
     'websocket_hybi/mochitest.ini',
 ]
 # OOP tests don't work on Windows (bug 763081) or native-fennec
 # (see Bug 774939). App permission checks are also disabled on
 # anything but B2G (Bug 900707).
 if CONFIG['MOZ_CHILD_PERMISSIONS']:
     MOCHITEST_MANIFESTS += [
rename from dom/base/test/mixedcontentblocker/bug803225_test_mailto.html
rename to dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Tests for Mixed Content Frame Navigation</title>
 </head>
 <body>
 <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;
   var TIMEOUT_INTERVAL = 100;
 
   var testContent = document.getElementById("testContent");
 
   // Test 1: Navigate secure iframe to insecure iframe on an insecure page
@@ -39,17 +39,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     } catch(e) {
       if (e.name === "SecurityError") {
         // We received an exception we didn't expect.
         throw e;
       }
       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) {
         counter_test1++;
         setTimeout(navigationStatus, TIMEOUT_INTERVAL, iframe_test1);
       }
       else {
@@ -58,17 +58,17 @@ https://bugzilla.mozilla.org/show_bug.cg
       }
     }
   }
 
   setTimeout(navigationStatus, TIMEOUT_INTERVAL, iframe_test1);
 
   // 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");
   };
   testContent.appendChild(iframe_test2);
 
 </script>
 </body>
 </html>
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
@@ -4,17 +4,17 @@
 Tests for Mixed Content Blocker - Opening link with _blank target in an https iframe.
 https://bugzilla.mozilla.org/show_bug.cgi?id=841850
 -->
 <head>
   <meta charset="utf-8">
   <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");
   blankTarget.click();
 
   var os = SpecialPowers.Cc["@mozilla.org/observer-service;1"].
      getService(SpecialPowers.Components.interfaces.nsIObserverService);
   var observer = {
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
@@ -4,17 +4,17 @@
 Tests for Mixed Content Blocker - Navigating Grandchild frames when a secure parent doesn't exist
 https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 -->
 <head>
   <meta charset="utf-8">
   <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.
   var MAX_COUNT = 50;
   var TIMEOUT_INTERVAL = 100;
   var counter = 0;
 
   var child = document.getElementById("child");
@@ -27,17 +27,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     } catch(e) {
       if (e.message && e.message.indexOf("Permission denied to access property") == -1) {
         // We received an exception we didn't expect.
         throw e;
       }
       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 {
       if(counter < MAX_COUNT) {
         counter++;
         setTimeout(navigationStatus, TIMEOUT_INTERVAL, child);
       }
       else {
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
@@ -4,50 +4,50 @@
 <div id="content"></div>
 <script>
   // get the case from the query string
   var type = location.search.substring(1);
 
   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;
 
     case "insecurePage_navigate_child_response":
       parent.parent.postMessage({"test": "insecurePage_navigate_child", "msg": "navigated to insecure iframe on insecure page"}, "http://mochi.test:8888");
       document.getElementById("content").innerHTML = "Navigated from secure to insecure frame on an insecure page";
       break;
 
     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;
 
     case "insecurePage_navigate_grandchild_response":
       parent.parent.parent.postMessage({"test": "insecurePage_navigate_grandchild", "msg": "navigated to insecure grandchild iframe on insecure page"}, "http://mochi.test:8888");
       document.getElementById("content").innerHTML = "Navigated from secure to insecure grandchild frame on an insecure page";
       break;
 
     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;
 
     case "securePage_navigate_child_response":
       document.getElementById("content").innerHTML = "<p>Navigated from secure to insecure frame on a secure page</p>";
       parent.parent.postMessage({"test": "securePage_navigate_child", "msg": "navigated to insecure iframe on secure page"}, "http://mochi.test:8888");
       break;
 
     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;
 
     case "securePage_navigate_grandchild_response":
       dump("\nNavigated to grandchild iframe from secure location to insecure location.  About to post message to the top page.\n");
       parent.parent.parent.postMessage({"test": "securePage_navigate_grandchild", "msg": "navigated to insecure grandchild iframe on secure page"}, "http://mochi.test:8888");
       dump("\npostMessage to parent attempted.\n");
       document.getElementById("content").innerHTML = "<p>Navigated from secure to insecure grandchild frame on a secure page</p>";
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
@@ -7,17 +7,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Tests for Mixed Content Frame Navigation</title>
 </head>
 <body>
 <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;
   var TIMEOUT_INTERVAL = 100;
 
   var testContent = document.getElementById("testContent");
 
   // Test 1: Navigate secure iframe to insecure iframe on a secure page
@@ -39,17 +39,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     } catch(e) {
       if (e.name === "SecurityError") {
         // We received an exception we didn't expect.
         throw e;
       }
       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) {
         counter_test1++;
         setTimeout(navigationStatus, TIMEOUT_INTERVAL, iframe_test1);
       }
       else {
         // After we have called setTimeout the maximum number of times, assume navigating the iframe is blocked
@@ -57,17 +57,17 @@ https://bugzilla.mozilla.org/show_bug.cg
       }
     }
   }
 
   setTimeout(navigationStatus, TIMEOUT_INTERVAL, iframe_test1);
 
   // 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");
   };
   testContent.appendChild(iframe_test3);
 
 </script>
 </body>
 </html>
rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
rename to dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
+++ b/dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
@@ -5,17 +5,17 @@ Tests for Mixed Content Blocker - Naviga
 https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 -->
 <head>
   <meta charset="utf-8">
   <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?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;
   var TIMEOUT_INTERVAL = 100;
   var counter = 0;
 
   var child = document.getElementById("child");
   function navigationStatus(child)
@@ -28,17 +28,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     } catch(e) {
       if (e.message && e.message.indexOf("Permission denied to access property") == -1) {
         // We received an exception we didn't expect.
         throw e;
       }
       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 {
       if(counter < MAX_COUNT) {
         counter++;
         setTimeout(navigationStatus, TIMEOUT_INTERVAL, child);
       }
       else {
rename from dom/base/test/mixedcontentblocker/file_mixed_content_main.html
rename to dom/security/test/mixedcontentblocker/file_main.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_main.html
+++ b/dom/security/test/mixedcontentblocker/file_main.html
@@ -33,17 +33,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     our ping implementation is off by default and does not comply with the current spec (bug 786347)
   case nsIContentPolicy::TYPE_BEACON:
 
   }
      */
 -->
 
 <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;
   var TIMEOUT_INTERVAL = 100;
 
   var testContent = document.getElementById("testContent");
 
   /* Part 1: Mixed Script tests */
rename from dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
rename to dom/security/test/mixedcontentblocker/file_main_bug803225.html
--- a/dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
+++ b/dom/security/test/mixedcontentblocker/file_main_bug803225.html
@@ -107,17 +107,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   // Test 7: mailto protocol
   var ioService = SpecialPowers.Cc["@mozilla.org/network/io-service;1"].
      getService(SpecialPowers.Ci.nsIIOService);
 
   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);
 
   var mailto = false;
 
   // listen for a messages from a new window
   var os = SpecialPowers.Cc["@mozilla.org/observer-service;1"].
@@ -139,17 +139,17 @@ https://bugzilla.mozilla.org/show_bug.cg
       setTimeout(mailtoProtocolStatus, TIMEOUT_INTERVAL);
     }
   }
 
   mailtoProtocolStatus();
 
   // 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) {
      status_wss = "opened";
      wss.close();
   }
   wss.onclose = function(e) {
     if(status_wss == "opened") {
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
rename from dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs
rename to dom/security/test/mixedcontentblocker/file_server.sjs
rename from dom/base/test/mixedcontentblocker/mochitest.ini
rename to dom/security/test/mixedcontentblocker/mochitest.ini
--- a/dom/base/test/mixedcontentblocker/mochitest.ini
+++ b/dom/security/test/mixedcontentblocker/mochitest.ini
@@ -1,20 +1,20 @@
 [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
+  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_mixed_content_blocker.html]
+[test_main.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mixed_content_blocker_bug803225.html]
+[test_bug803225.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mixed_content_blocker_frameNavigation.html]
+[test_frameNavigation.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
rename from dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
rename to dom/security/test/mixedcontentblocker/test_bug803225.html
--- a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
+++ b/dom/security/test/mixedcontentblocker/test_bug803225.html
@@ -59,17 +59,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     if(counter < 4) {
        for (var prop in testsToRun) {
          testsToRun[prop] = false;
        }
       //call to change the preferences
       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
       SpecialPowers.setBoolPref("security.mixed_content.block_display_content", origBlockDisplay);
       SpecialPowers.setBoolPref("security.mixed_content.block_active_content", origBlockActive);
       SimpleTest.finish();
     }
   }
@@ -136,13 +136,13 @@ https://bugzilla.mozilla.org/show_bug.cg
   }
 
   SimpleTest.waitForExplicitFinish();
   </script>
 </head>
 
 <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>
 </html>
rename from dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
rename to dom/security/test/mixedcontentblocker/test_frameNavigation.html
--- a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
+++ b/dom/security/test/mixedcontentblocker/test_frameNavigation.html
@@ -37,17 +37,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     for (var prop in testsToRunInsecure) {
       // some test hasn't run yet so we're not done
       if (!testsToRunInsecure[prop])
         return;
     }
     // 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) {
       // some test hasn't run yet so we're not done
       if (!testsToRunSecure[prop])
         return;
     }
     //if the secure and insecure testsToRun are all completed, change the block mixed active content pref and run the tests again.
@@ -59,17 +59,17 @@ https://bugzilla.mozilla.org/show_bug.cg
          testsToRunInsecure[prop] = false;
        }
       //call to change the preferences
       counter++;
       SpecialPowers.setBoolPref("security.mixed_content.block_active_content", false);
       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
       SpecialPowers.setBoolPref("security.mixed_content.block_active_content", origBlockActive);
       SimpleTest.finish();
     }
   }
 
@@ -114,14 +114,14 @@ https://bugzilla.mozilla.org/show_bug.cg
   }
 
   SimpleTest.waitForExplicitFinish();
   </script>
 </head>
 
 <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>
 </body>
 </html>
rename from dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
rename to dom/security/test/mixedcontentblocker/test_main.html
--- a/dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
+++ b/dom/security/test/mixedcontentblocker/test_main.html
@@ -57,17 +57,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     xhr: false,
   };
 
   function log(msg) {
     document.getElementById("log").textContent += "\n" + msg;
   }
 
   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() {
     for (var prop in testsToRun) {
       // some test hasn't run yet so we're not done
       if (!testsToRun[prop])
         return;
     }
--- a/dom/security/test/moz.build
+++ b/dom/security/test/moz.build
@@ -9,13 +9,14 @@ XPCSHELL_TESTS_MANIFESTS += [
 ]
 
 GeckoCppUnitTests([
     'TestCSPParser',
 ])
 
 MOCHITEST_MANIFESTS += [
     'csp/mochitest.ini',
+    'mixedcontentblocker/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [
     'csp/chrome.ini',
 ]