Bug 847279 - Fix hardcoded path names in mochitests to match relativesrcdir. r=mbrubeck
authorBen Kelly <ben@wanderview.com>
Thu, 18 Apr 2013 10:32:25 -0400
changeset 129200 46280589c1dc45fae34021b0cd356ca003a1be4e
parent 129199 22ed2b874b4aae6e8d4a5fa77b4016429d44d039
child 129201 896d943683eb5eb48a08765fbf0a7cc9ff666fec
push idunknown
push userunknown
push dateunknown
reviewersmbrubeck
bugs847279
milestone23.0a1
Bug 847279 - Fix hardcoded path names in mochitests to match relativesrcdir. r=mbrubeck
dom/plugins/test/mochitest/307-xo-redirect.sjs
dom/plugins/test/mochitest/test_busy_hang.xul
dom/plugins/test/mochitest/test_idle_hang.xul
dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
dom/plugins/test/mochitest/test_redirect_handling.html
dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
layout/base/tests/chrome/test_bug551434.html
security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
toolkit/components/places/tests/mochitest/bug_411966/redirect.js
toolkit/components/places/tests/mochitest/test_bug_411966.html
toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
--- a/dom/plugins/test/mochitest/307-xo-redirect.sjs
+++ b/dom/plugins/test/mochitest/307-xo-redirect.sjs
@@ -1,6 +1,6 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarily");
-  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/loremipsum.txt");
+  response.setHeader("Location", "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt");
   response.setHeader("Content-Type", "text/html");
 }
--- a/dom/plugins/test/mochitest/test_busy_hang.xul
+++ b/dom/plugins/test/mochitest/test_busy_hang.xul
@@ -4,17 +4,17 @@
                  type="text/css"?>
 <window title="Basic Plugin Tests"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <title>Plugin Busy Hang Test</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
   <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
     <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
   </body>
   <script class="testbody" type="application/javascript">
     <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
 function runTests() {
--- a/dom/plugins/test/mochitest/test_idle_hang.xul
+++ b/dom/plugins/test/mochitest/test_idle_hang.xul
@@ -4,17 +4,17 @@
                  type="text/css"?>
 <window title="Basic Plugin Tests"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <title>Plugin Idle Hang Test</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
   <script type="application/javascript"
-          src="http://mochi.test:8888/chrome/dom/plugins/test/hang_test.js" />
+          src="http://mochi.test:8888/chrome/dom/plugins/test/mochitest/hang_test.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 </body>
 <script class="testbody" type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
 function runTests() {
--- a/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
+++ b/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xul
@@ -3,16 +3,18 @@
 <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
                  type="text/css"?>
 <window title="NPAPI Private Mode Tests"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <title>NPAPI Private Mode Tests</title>
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/chrome-harness.js" />
 <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
 <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
 </body>
 <script class="testbody" type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
 
@@ -47,17 +49,17 @@ function runTestsCallback() {
 
   // open a window with private mode and get the references of the elements.
   var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIWebNavigation)
                     .QueryInterface(Ci.nsIDocShellTreeItem)
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-  var contentPage = "chrome://mochitests/content/chrome/dom/plugins/test/privatemode_perwindowpb.xul";
+  var contentPage = getRootDirectory(window.location.href) + "privatemode_perwindowpb.xul";
 
   function testOnWindow(aIsPrivate, aCallback) {
     var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
     win.addEventListener("load", function onLoad() {
       win.removeEventListener("load", onLoad, false);
       win.addEventListener("DOMContentLoaded", function onInnerLoad() {
         if (win.content.location.href == "about:privatebrowsing") {
           win.gBrowser.loadURI(contentPage);
--- a/dom/plugins/test/mochitest/test_redirect_handling.html
+++ b/dom/plugins/test/mochitest/test_redirect_handling.html
@@ -7,17 +7,17 @@
   <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
 
   <script class="testbody" type="application/javascript">
     SimpleTest.waitForExplicitFinish();
 
     var p = document.getElementById("plugin1");
 
     var redirectingURL = "307-xo-redirect.sjs";
-    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/loremipsum.txt";
+    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
 
     var expectedWriteURL = "";
     var expectedNotifyStatus = -1;
 
     function redirectCallback(url, httpStatus) {
       is(url, redirectTargetURL, "Test for expected redirect notify URL.");
       is(httpStatus, 307, "Test for expected http redirect status.");
     }
--- a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
@@ -19,17 +19,17 @@
     const ok = window.opener.wrappedJSObject.ok;
     const is = window.opener.wrappedJSObject.is;
     const done = window.opener.wrappedJSObject.done;
     const SimpleTest = window.opener.wrappedJSObject.SimpleTest;
 
     const nsIWebProgress = Components.interfaces.nsIWebProgress;
     const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
 
-    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/plugin_visibility_loader.html';
+    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/mochitest/plugin_visibility_loader.html';
 
     function ProgressListener() {
     }
     ProgressListener.prototype.onStateChange =
       function(progress, req, flags, status) {
         if ((flags & nsIWebProgressListener.STATE_IS_WINDOW) &&
             (flags & nsIWebProgressListener.STATE_STOP))
           browserLoaded();
--- a/layout/base/tests/chrome/test_bug551434.html
+++ b/layout/base/tests/chrome/test_bug551434.html
@@ -10,17 +10,17 @@
 <body>
 </div>
 <pre id="test">
 <input id="i1" onkeydown="gKeyDown1++; $('i2').focus();" onkeypress="gKeyPress1++;" onkeyup="gKeyUp1++;"/>
 <input id="i2" onkeydown="gKeyDown2++;" onkeypress="gKeyPress2++;" onkeyup="gKeyUp2++;"/>
 
 <input id="i3" onkeydown="gKeyDown3++; frames[0].document.getElementById('i4').focus();"
        onkeypress="gKeyPress3++;" onkeyup="gKeyUp3++;"/>
-<iframe id="iframe" src="http://example.org/chrome/layout/base/test/chrome/bug551434_childframe.html"></iframe>
+<iframe id="iframe" src="http://example.org/chrome/layout/base/tests/chrome/bug551434_childframe.html"></iframe>
 
 <script class="testbody" type="text/javascript">
 
 SimpleTest.waitForExplicitFinish();
 
 var gKeyDown1 = 0, gKeyPress1 = 0, gKeyUp1 = 0;
 var gKeyDown2 = 0, gKeyPress2 = 0, gKeyUp2 = 0;
 var gKeyDown3 = 0, gKeyPress3 = 0, gKeyUp3 = 0;
--- a/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step2.html
@@ -8,17 +8,17 @@
 
   <script class="testbody" type="text/javascript">
 
   window.onload = function runTest()
   {
     window.setTimeout(function () 
     {
       window.location = 
-        "https://example.com/tests/security/ssl/mixedcontent/bug383369step3.html?runtest";
+        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug383369step3.html?runtest";
     }, 0);
   }
 
   function afterNavigationTest()
   {
   }
 
   </script>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html
@@ -3,11 +3,11 @@
 <head>
 </head>
 
 <body>
   This is frame 2: 
   <script>
     document.write(location.href);
   </script>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <META http-equiv="Refresh"
-      Content="0; URL=http://example.com/tests/security/ssl/mixedcontent/iframe.html">
+      Content="0; URL=http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html">
 <html>
   <body>
     Redirecting by meta tag...
   </body>
 </html>
\ No newline at end of file
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/iframe.html");
+  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
 }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/iframe.html");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html");
 }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
 }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg");
 }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mixedContentTest.js
@@ -123,18 +123,18 @@ function postMsg(message)
 
 function finish()
 {
   if (history.length == 1 && !bypassNavigationTest)
   {
     window.setTimeout(function()
     {
       window.location.assign(navigateToInsecure ?
-        "http://example.com/tests/security/ssl/mixedcontent/backward.html" :
-        "https://example.com/tests/security/ssl/mixedcontent/backward.html");
+        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html" :
+        "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/backward.html");
     }, 0);
   }
   else
   {
     postMsg("done");
     window.close();
   }
 }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs
@@ -1,5 +1,5 @@
 function handleRequest(request, response)
 {
   response.setStatusLine(request.httpVersion, 307, "Moved temporarly");
-  response.setHeader("Location", "http://example.com/tests/security/ssl/mixedcontent/emptyimage.sjs");
+  response.setHeader("Location", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/emptyimage.sjs");
 }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug329869.html
@@ -11,17 +11,17 @@
   hasMixedActiveContent = true;
 
   function runTest()
   {
     isSecurityState("secure");
     window.setTimeout(function() 
     {
       var newElement = document.createElement("script");
-      newElement.src= "http://example.org/tests/security/ssl/mixedcontent/bug329869.js";
+      newElement.src= "http://example.org/tests/security/manager/ssl/tests/mochitest/mixedcontent/bug329869.js";
       document.body.appendChild(newElement);
     }, 0);
   }
 
   function afterNavigationTest()
   {
     isSecurityState("broken", "security still broken after navigation");
     finish();
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug455367.html
@@ -23,11 +23,11 @@
     isSecurityState("secure", "secure after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/redirecttoemptyimage.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/redirecttoemptyimage.sjs" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug472986.html
@@ -16,17 +16,17 @@
 
   // Clear the default onload assigned to test start because we must
   // wait for replaced image to load and only after that test the security state
   var onLoadFunction = window.onload;
   window.onload = function()
   {
     var img1 = document.getElementById("img1");
     img1.addEventListener("load", onLoadFunction, false);
-    img1.src = "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+    img1.src = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
   }
 
   function runTest()
   {
     isSecurityState("secure", "secure");
     finish();
   }
 
@@ -35,11 +35,11 @@
     isSecurityState("secure", "secure after navigation");
     finish();
   }
   
   </script>
 </head>
 
 <body>
-  <img id="img1" src="https://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
+  <img id="img1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html
@@ -11,17 +11,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <script class="testbody" type="text/javascript">
     
   loadAsInsecure = true;
 
   function runTest()
   {
-    window.location = "https://example.com/tests/security/ssl/mixedcontent/nocontent.sjs";
+    window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs";
     window.setTimeout(function() {
       isSecurityState("insecure", "location.href doesn't effect the security state");
       is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");
       finish();
     }, 1000);
   }
 
   function afterNavigationTest()
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssBefore1.html
@@ -7,17 +7,17 @@
   <script type="text/javascript" src="/MochiKit/Style.js"></script>
   <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="mixedContentTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <style type="text/css">
     p:before
     {
-      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
     }
   </style>
 
   <script class="testbody" type="text/javascript">
 
   function runTest()
   {
     isSecurityState("broken", "insecure content added by :before styling breaks security");
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent1.html
@@ -8,17 +8,17 @@
   <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="mixedContentTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <style type="text/css">
     p
     {
-      content: url(http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg);
+      content: url(http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg);
     }
   </style>
 
   <script class="testbody" type="text/javascript">
 
   function runTest()
   {
     isSecurityState("broken", "insecure content added by :before styling breaks security");
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_cssContent2.html
@@ -15,17 +15,17 @@
   if (navigator.platform.startsWith("Mac")) {
     SimpleTest.expectAssertions(0, 1);
   }
 
   function runTest()
   {
     isSecurityState("secure");
     document.getElementById("para").style.content =
-      "url('http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg')";
+      "url('http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg')";
 
     waitForSecurityState("broken", function()
     {
       isSecurityState("broken", "insecure content added by styling breaks security");
       finish();
     });
   }
 
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite1.html
@@ -25,12 +25,12 @@
   }
 
   </script>
 </head>
 
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<img src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />");
+    "<img src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />");
   </script>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_documentWrite2.html
@@ -27,12 +27,12 @@
   }
 
   </script>
 </head>
 
 <body>
   <script class="testbody" type="text/javascript">
   document.write(
-    "<iframe src='http://example.com/tests/security/ssl/mixedcontent/iframe.html'></iframe>");
+    "<iframe src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html'></iframe>");
   </script>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecurePicture.html
@@ -13,34 +13,34 @@
   <script class="testbody" type="text/javascript">
 
   function runTest()
   {
     isSecurityState("secure");
     window.setTimeout(function() {
       // Don't do this synchronously from onload handler
       document.getElementById("image1").src =
-        "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+        "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
     }, 0);
 
     waitForSecurityState("broken", function()
     {
       isSecurityState("broken", "src='http://...' changed to broken");
       finish();
     });
   }
 
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynDelayedUnsecureXHR.html
@@ -17,17 +17,17 @@
   function runTest()
   {
     isSecurityState("secure");
     window.setTimeout(function()
     {
       try
       {
         var req = new XMLHttpRequest();
-        req.open("GET", "http://example.com/tests/security/ssl/mixedcontent/alloworigin.sjs", false);
+        req.open("GET", "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/alloworigin.sjs", false);
         req.send(null);
 
         // Change should be immediate, the request was sent synchronously
         isSecurityState("broken", "security broken after insecure XHR");
       }
       catch (ex)
       {
         ok(false, ex);
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureBackground.html
@@ -13,32 +13,32 @@
   <script class="testbody" type="text/javascript">
 
   // This test, as is, equals to https://kuix.de/misc/test17/358438.php
 
   function runTest()
   {
     isSecurityState("secure");
     document.body.background =
-      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
     waitForSecurityState("broken", function() 
     {
       isSecurityState("broken", "document.body.background='http://...' changed to broken");
       finish();
     });
   }
 
   function afterNavigationTest()
   {
     is(document.body.background,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "document backround secure again");
     isSecurityState("secure", "secure after re-navigation");
     finish();
   }
 
   </script>
 </head>
 
-<body background="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
+<body background="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureIframeRedirect.html
@@ -20,24 +20,24 @@
     var self = window;
     var iframe = document.getElementById("iframe1");
     iframe.onload = function() {
       self.isSecurityState("broken", "src='redirect to unsecure' changed to broken");
       self.finish();
     }
     
     iframe.src =
-      "https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs";
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs";
   }
 
   function afterNavigationTest()
   {
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <iframe id="iframe1" src="https://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe id="iframe1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicture.html
@@ -13,32 +13,32 @@
   <script class="testbody" type="text/javascript">
 
   // This test, as is, equals to https://kuix.de/misc/test17/358438.php
 
   function runTest()
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+      "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='http://...' changed to broken");
       finish();
     }, 500);
   }
 
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecurePicturePreload.html
@@ -8,17 +8,17 @@
   <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="mixedContentTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <script class="testbody" type="text/javascript">
 
   (new Image()).src =
-    "http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg";
+    "http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg";
 
   function runTest()
   {
     isSecurityState("broken", "(new Image()).src='http://...' changed to broken");
     finish();
   }
 
   function afterNavigationTest()
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_dynUnsecureRedirect.html
@@ -7,32 +7,32 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <script class="testbody" type="text/javascript">
 
   function runTest()
   {
     isSecurityState("secure");
     document.getElementById("image1").src =
-      "https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs";
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs";
 
     window.setTimeout(function() {
       isSecurityState("broken", "src='redirect to unsecure' changed to broken");
       finish();
     }, 500);
   }
 
   function afterNavigationTest()
   {
     is(document.getElementById("image1").src,
-      "https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg",
+      "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg",
       "img.src secure again");
     isSecurityState("secure", "security full after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img id="image1" src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img id="image1" src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html
@@ -14,17 +14,17 @@
 
   function runTest()
   {
     isSecurityState("secure");
     
     window.setTimeout(function() 
     {
       document.getElementById("buddy").innerHTML =
-        "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
+        "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
     }, 1);
 
     waitForSecurityState("broken", function() 
     {
       isSecurityState("broken", "innerHTML loading insecure changed to broken");
       finish();
     });
   }
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html
@@ -12,17 +12,17 @@
 
   <script class="testbody" type="text/javascript">
 
   function runTest()
   {
     isSecurityState("secure");
     
     document.getElementById("buddy").innerHTML =
-      "<img id='image1' src='http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg' />";
+      "<img id='image1' src='http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg' />";
 
     window.setTimeout(function() {
       isSecurityState("broken", "innerHTML loading insecure changed to broken");
       finish();
     }, 500);
   }
 
   function afterNavigationTest()
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_secureAll.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="/MochiKit/DOM.js"></script>
   <script type="text/javascript" src="/MochiKit/Style.js"></script>
   <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="mixedContentTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <link rel="stylesheet" type="text/css" 
-    href="https://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
+    href="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
   // Navigation test goes over an insecure page, test state leak
   navigateToInsecure = true;
 
   function runTest()
   {
@@ -29,13 +29,13 @@
     isSecurityState("secure", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
-  <img src="https://example.com/tests/security/ssl/mixedcontent/imgsecredirect.sjs" />
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframesecredirect.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgsecredirect.sjs" />
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframesecredirect.sjs" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_securePicture.html
@@ -25,11 +25,11 @@
     isSecurityState("insecure", "left insecure after renavigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureBackground.html
@@ -24,11 +24,11 @@
   {
     isSecurityState("broken", "security after navigation");
     finish();
   }
 
   </script>
 </head>
 
-<body background="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg">
+<body background="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg">
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureCSS.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="/MochiKit/DOM.js"></script>
   <script type="text/javascript" src="/MochiKit/Style.js"></script>
   <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="mixedContentTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   
   <link rel="stylesheet" type="text/css" 
-    href="http://example.com/tests/security/ssl/mixedcontent/somestyle.css" />
+    href="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/somestyle.css" />
 
   <script class="testbody" type="text/javascript">
 
   hasMixedActiveContent = true;
 
   function runTest()
   {
     isSecurityState("broken", "insecure <img> load breaks security");
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe.html
@@ -25,11 +25,11 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/iframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe.html"></iframe>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframe2.html
@@ -25,11 +25,11 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframe2.html"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframe2.html"></iframe>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html
@@ -25,12 +25,12 @@
       finish();
     }, 500);
   }
 
   </script>
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeMetaRedirect.html"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html"></iframe>
 </body>
 </html>
  
\ No newline at end of file
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeRedirect.html
@@ -25,12 +25,12 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <iframe src="https://example.com/tests/security/ssl/mixedcontent/iframeunsecredirect.sjs"></iframe>
+  <iframe src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/iframeunsecredirect.sjs"></iframe>
 </body>
 </html>
  
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePicture.html
@@ -23,11 +23,11 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecurePictureInIframe.html
@@ -25,11 +25,11 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <iframe src="http://example.com/tests/security/ssl/mixedcontent/unsecureIframe.html"></iframe>
+  <iframe src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html"></iframe>
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureRedirect.html
@@ -25,11 +25,11 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img src="https://example.com/tests/security/ssl/mixedcontent/imgunsecredirect.sjs" />
+  <img src="https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/imgunsecredirect.sjs" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecureIframe.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/moonsurface.jpg" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/moonsurface.jpg" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/unsecurePictureDup.html
@@ -23,11 +23,11 @@
     isSecurityState("broken", "security still broken after navigation");
     finish();
   }
 
   </script>
 </head>
 
 <body>
-  <img src="http://example.com/tests/security/ssl/mixedcontent/hugebmp.sjs" />
+  <img src="http://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/hugebmp.sjs" />
 </body>
 </html>
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_stricttransportsecurity.html
@@ -7,17 +7,17 @@
 <head>
   <title>opens additional content that should be converted to https</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
   <script class="testbody" type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
-  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
+  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
 
   // initialized manually here
   var testsleft = {'plain': 4, 'subdom': 4};
   var roundsLeft = 2;
 
   var testframes = {
     'samedom':
       {'url':     "http://example.com" + STSPATH + "/verify.sjs",
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
@@ -9,20 +9,20 @@
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
 
   <script class="testbody" type="text/javascript">
   SimpleTest.waitForExplicitFinish();
 
   const Cc = Components.classes;
   const Ci = Components.interfaces;
-  const STSPATH = "/tests/security/ssl/stricttransportsecurity";
+  const STSPATH = "/tests/security/manager/ssl/tests/mochitest/stricttransportsecurity";
   const NUM_TEST_FRAMES = 4;
   const CONTENT_PAGE =
-    "http://mochi.test:8888/chrome/security/ssl/stricttransportsecurity/page_blank.html";
+    "http://mochi.test:8888/chrome/security/manager/ssl/tests/mochitest/stricttransportsecurity/page_blank.html";
 
   // This is how many sub-tests (testframes) in each round.
   // When the round begins, this will be initialized.
   var testsleftinround = 0;
   var currentround = "";
   var mainWindow =
     window.QueryInterface(Ci.nsIInterfaceRequestor).
     getInterface(Ci.nsIWebNavigation).QueryInterface(Ci.nsIDocShellTreeItem).
--- a/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
+++ b/toolkit/components/places/tests/mochitest/bug_411966/redirect.js
@@ -28,20 +28,20 @@ ok(storage != null, "Could not get Stora
 // Get database connection.
 var mDBConn = histsvc.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
 ok(mDBConn != null, "Could not get Database Connection");
 
 function uri(URIString) {
   return ios.newURI(URIString, null, null);
 }
 
-var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TypedPage.htm");
-var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/ClickedPage.htm");
-var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/TempRedirectPage.htm");
-var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/bug_411966/PermRedirectPage.htm");
+var typedURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TypedPage.htm");
+var clickedLinkURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/ClickedPage.htm");
+var temporaryRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/TempRedirectPage.htm");
+var permanentRedirectURI = uri("http://localhost:8888/tests/toolkit/components/places/tests/mochitest/bug_411966/PermRedirectPage.htm");
 
 // Stream Listener
 function StreamListener(aChannel, aCallbackFunc) {
   this.mChannel = aChannel;
   this.mCallbackFunc = aCallbackFunc;
 }
 
 StreamListener.prototype = {
--- a/toolkit/components/places/tests/mochitest/test_bug_411966.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_411966.html
@@ -1,17 +1,17 @@
 <!DOCTYPE HTML>
 <html>
   <!--
     https://bugzilla.mozilla.org/show_bug.cgi?id=411966
   -->
   <head>
     <title>Test for Bug 411966</title>
     <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="bug_411966/redirect.js"></script>
+    <script type="text/javascript" src="mochitest/bug_411966/redirect.js"></script>
     <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   </head>
   <body>
     <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=411966">
       Mozilla Bug 411966</a>
     <p id="display"></p>
     <div id="content" style="display: none">
       <iframe id="iframe"></iframe>
--- a/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
+++ b/toolkit/components/places/tests/mochitest/test_bug_461710_perwindowpb.html
@@ -55,17 +55,17 @@ function waitForTrue(fn, onWaitComplete)
           onWaitComplete.call();
         }
       }, 20);
 }
 
 const kRed = "rgb(255, 0, 0)";
 const kBlue = "rgb(0, 0, 255)";
 
-var testpath = "/tests/toolkit/components/places/tests/mochitest/../bug_461710/";
+var testpath = "/tests/toolkit/components/places/tests/mochitest/bug_461710/";
 var prefix = "http://mochi.test:8888" + testpath;
 var subtests = [
                    "visited_page.html",   // 1
                    "link_page.html",      // 2
                    "link_page-2.html",    // 3
                    "link_page-3.html"     // 4
                ];
 
@@ -158,17 +158,17 @@ function handleLoad() {
 }
 
 var mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIWebNavigation)
                     .QueryInterface(Ci.nsIDocShellTreeItem)
                     .rootTreeItem
                     .QueryInterface(Ci.nsIInterfaceRequestor)
                     .getInterface(Ci.nsIDOMWindow);
-var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/../bug_461710/iframe.html";
+var contentPage = "http://mochi.test:8888/tests/toolkit/components/places/tests/mochitest/bug_461710/iframe.html";
 
 function testOnWindow(aIsPrivate, aCallback) {
   var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
   win.addEventListener("load", function onLoad() {
     win.removeEventListener("load", onLoad, false);
     win.addEventListener("DOMContentLoaded", function onInnerLoad() {
       if (win.content.location.href == "about:privatebrowsing") {
         win.gBrowser.loadURI(contentPage);