--- a/docshell/moz.build
+++ b/docshell/moz.build
@@ -16,17 +16,17 @@ DIRS += [
 
 XPCSHELL_TESTS_MANIFESTS += [
     'test/unit/xpcshell.ini',
     'test/unit_ipc/xpcshell.ini',
 ]
 
 MOCHITEST_MANIFESTS += [
     'test/iframesandbox/mochitest.ini',
-    'test/mochitest/mochitest.ini',
+    'test/mochitest.ini',
     'test/navigation/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [
     'test/chrome/chrome.ini',
 ]
 
 BROWSER_CHROME_MANIFESTS += [

deleted file mode 100644
--- a/docshell/test/browser/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/browser-test"
-  ]
-};

rename from docshell/test/mochitest/bug123696-subframe.html
rename to docshell/test/bug123696-subframe.html

new file mode 100644
index 0000000000000000000000000000000000000000..86b9c8c0964e8012b94bc1d965b296aae512a6de
GIT binary patch
literal 1311
zc$}S-zmL-}6vtiCA`y{|6N1UgKso8!fH+aObFy(Aj-f(yMsDJ}q@;1M-Mb<&P*#|k
z85kJ(FSvi;b`TSP06TW=G)aFTge#}D{oePzzR!yX$5zt@YJ8m2-q$-9-;xFZYF-CB
z0B2!L8Slnok`A9=1J;}GsITU5)&##BHvm#60g4HZ0vkdk5|NU?xFJt3ZRBYKG@{XK
zX=l!Dh;q3?7$%YL3d~N4aAC~IiSI^O-~&Ns!c!6U)N;yF#6y<kA~;X7h@N+8PBOx}
zIc6ji-JHH8ciUQ~y^B0!>q5QdyQAspgNKhF-QPE%0;LM2EX-+=2@*jpj4|?XnOR2v
zBex={YHo#4HM?aJdoZKR=&EMASZEO>7%Vy6en)#dAI6tQlF^ajl$<a;Ar(&i2kNW2
ziIY=;GJXXpry%7RRMM1BM?5BJ%AEx+_0(RA(x~J+dhJ5a!fnNY+U6f>R8g#zNp2xe
z?*|)G8S{D~V|<3S_rYJnExp>iZZPKcD29Qv4x#rx>;3xq;>m^lt)_w?dxH@kmk@4!
zI_#q@FG~f2@hc(7lL?Vc5et!b$g62`=DWtoRi}D{RJLp;+xp(&@Yz#;rS2=07Bn}1
z*a+2XyMa3+QNl<l){EfSgX6}Po7T2l!vV$kJXg>99n#Ww$Z!TgRc5`ZOPROxFG{@D
j;w|0ct1|0Ysxlo5tUzjMNLr?KRhe1xb1A>~n`-q3F;<Bo

new file mode 100644
index 0000000000000000000000000000000000000000..ed8234dbc4458834fda75b5184bbae56eef12bd2
GIT binary patch
literal 1000
zc$^FHW@Zs#U|`^2_!ATC9Gbgx%{Cw}hLM4Rhe3uRF)ukIzo=L*qa-&cG=!6ZIXgHh
z2!u;3xEUB(z5<njb<dsP&3DLv$K|_i>r`F^MI{!ehC6qTs<ydJQQ>lHy?uGohsez`
z)i$3~a-Lq2%$d1nB}2fRlAIIrw<fGxv3X5EI<wh9JGS_n;SGfW9uIQXwp{9Tb)5Yp
zLfhM^`r+;u8x!qLMZfw`<)PR0a_;tp@hvCjT~=x{_E-N|XXG5~!}V!J*x9#RZoS!d
zy7Z+%vJ6k9K=bEAVjf+RrnM7melTkVCF!%in){*qYv%lB{`t2)djGWj;bneRH~{W<
zf!JW@OTpW(9s}~GLH(YYR+N~VisbixpuhVu{azb*TByl@XU}I*S-lfIH+CQU=e;1X
zYpPN1$B*BG7W163kTXA-RxX_J_^MV0=hjm#4H=76Q~l)Di#Qnh^j@eib}?PB-0mG)
z`9j}^FKwc}G*!D+GW?W0?eNKK#oRis>(TAMW~{#vvnJ}zR@L|^KbHs}v)Yo9dxC{W
zn5|6djLS8NjY)I5A4sozqinm#M{^rz-#xB*Kdtu7j@$kFo%Y_64L2gDZ2oR@l>KDs
z*TWv-*UYT;C>DROKav*ab*ptM+li88->+V>-XtD?k`7KTv0Ksy<Q-ywghf$mT2X3o
z2ElZo+jo%fkb;2A`x@87OJ`+#TywgvQC--c;j~mouH&w#ztt-Zw$H7c8ChV%$I;j0
zdeP*-JoZB_-(5B{hn_Q)==6O&<MF(C`v0$OGBRp+t(`GL?b@e;U2*4bNtwAX<6m8x
z#9lnVCMD)i%Hd0{lZ|d4{jk6{di5>c6<(eq3r+<WaDVGon)tP|>Rg@SgZtf&*aN&7
zndF#prEUoZ5CAe6mNbG`sA-)Q;zu<9A)APqW)LPeH2wjSs40jQl7jG<h#B(8CUP(_
Xpv40&H?p#UbTI?rHz0k73B&^c?qg`D

rename from docshell/test/mochitest/bug404548-subframe.html
rename to docshell/test/bug404548-subframe.html

rename from docshell/test/mochitest/bug404548-subframe_window.html
rename to docshell/test/bug404548-subframe_window.html

rename from docshell/test/mochitest/bug413310-post.sjs
rename to docshell/test/bug413310-post.sjs

rename from docshell/test/mochitest/bug413310-subframe.html
rename to docshell/test/bug413310-subframe.html

rename from docshell/test/mochitest/bug529119-window.html
rename to docshell/test/bug529119-window.html

rename from docshell/test/mochitest/bug530396-noref.sjs
rename to docshell/test/bug530396-noref.sjs

rename from docshell/test/mochitest/bug530396-subframe.html
rename to docshell/test/bug530396-subframe.html

rename from docshell/test/mochitest/bug570341_recordevents.html
rename to docshell/test/bug570341_recordevents.html

rename from docshell/test/mochitest/bug668513_redirect.html
rename to docshell/test/bug668513_redirect.html

rename from docshell/test/mochitest/bug668513_redirect.html^headers^
rename to docshell/test/bug668513_redirect.html^headers^

rename from docshell/test/mochitest/bug691547_frame.html
rename to docshell/test/bug691547_frame.html

deleted file mode 100644
--- a/docshell/test/chrome/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/chrome-test"
-  ]
-};

rename from docshell/test/mochitest/dummy_page.html
rename to docshell/test/dummy_page.html

rename from docshell/test/mochitest/file_anchor_scroll_after_document_open.html
rename to docshell/test/file_anchor_scroll_after_document_open.html

rename from docshell/test/mochitest/file_bfcache_plus_hash_1.html
rename to docshell/test/file_bfcache_plus_hash_1.html

rename from docshell/test/mochitest/file_bfcache_plus_hash_2.html
rename to docshell/test/file_bfcache_plus_hash_2.html

rename from docshell/test/mochitest/file_bug1121701_1.html
rename to docshell/test/file_bug1121701_1.html

rename from docshell/test/mochitest/file_bug1121701_2.html
rename to docshell/test/file_bug1121701_2.html

rename from docshell/test/mochitest/file_bug1151421.html
rename to docshell/test/file_bug1151421.html

rename from docshell/test/mochitest/file_bug1186774.html
rename to docshell/test/file_bug1186774.html

rename from docshell/test/mochitest/file_bug1450164.html
rename to docshell/test/file_bug1450164.html

new file mode 100644
--- /dev/null
+++ b/docshell/test/file_bug369814.html
@@ -0,0 +1,1 @@
+<script>window.onunload = function() { frameElement.unloading(); }</script>

rename from docshell/test/mochitest/file_bug385434_1.html
rename to docshell/test/file_bug385434_1.html

rename from docshell/test/mochitest/file_bug385434_2.html
rename to docshell/test/file_bug385434_2.html

rename from docshell/test/mochitest/file_bug385434_3.html
rename to docshell/test/file_bug385434_3.html

rename from docshell/test/mochitest/file_bug475636.sjs
rename to docshell/test/file_bug475636.sjs

rename from docshell/test/mochitest/file_bug509055.html
rename to docshell/test/file_bug509055.html

rename from docshell/test/mochitest/file_bug511449.html
rename to docshell/test/file_bug511449.html

rename from docshell/test/mochitest/file_bug540462.html
rename to docshell/test/file_bug540462.html

rename from docshell/test/mochitest/file_bug580069_1.html
rename to docshell/test/file_bug580069_1.html

rename from docshell/test/mochitest/file_bug580069_2.sjs
rename to docshell/test/file_bug580069_2.sjs

rename from docshell/test/mochitest/file_bug590573_1.html
rename to docshell/test/file_bug590573_1.html

rename from docshell/test/mochitest/file_bug590573_2.html
rename to docshell/test/file_bug590573_2.html

rename from docshell/test/mochitest/file_bug637644_1.html
rename to docshell/test/file_bug598895_1.html

rename from docshell/test/mochitest/file_bug637644_2.html
rename to docshell/test/file_bug598895_2.html

rename from docshell/test/mochitest/file_bug634834.html
rename to docshell/test/file_bug634834.html

new file mode 100644
--- /dev/null
+++ b/docshell/test/file_bug637644_1.html
@@ -0,0 +1,1 @@
+<script>window.onload = function() { opener.postMessage('loaded', '*'); }</script><body>Should show</body>

new file mode 100644
--- /dev/null
+++ b/docshell/test/file_bug637644_2.html
@@ -0,0 +1,1 @@
+<script>window.onload = function() { opener.postMessage('loaded', '*'); }</script><body></body>

rename from docshell/test/mochitest/file_bug640387.html
rename to docshell/test/file_bug640387.html

rename from docshell/test/mochitest/file_bug662170.html
rename to docshell/test/file_bug653741.html

rename from docshell/test/mochitest/file_bug660404
rename to docshell/test/file_bug660404

rename from docshell/test/mochitest/file_bug660404-1.html
rename to docshell/test/file_bug660404-1.html

rename from docshell/test/mochitest/file_bug660404^headers^
rename to docshell/test/file_bug660404^headers^

new file mode 100644
--- /dev/null
+++ b/docshell/test/file_bug662170.html
@@ -0,0 +1,13 @@
+<html>
+<body onload='(parent || opener).childLoad()'>
+
+<div style='height:500px; background:yellow'>
+<a id='#top'>Top of the page</a>
+</div>
+
+<div id='bottom'>
+<a id='#bottom'>Bottom of the page</a>
+</div>
+
+</body>
+</html>

rename from docshell/test/mochitest/file_bug668513.html
rename to docshell/test/file_bug668513.html

rename from docshell/test/mochitest/file_bug669671.sjs
rename to docshell/test/file_bug669671.sjs

rename from docshell/test/mochitest/file_bug675587.html
rename to docshell/test/file_bug675587.html

rename from docshell/test/mochitest/file_bug680257.html
rename to docshell/test/file_bug680257.html

rename from docshell/test/mochitest/file_bug703855.html
rename to docshell/test/file_bug703855.html

rename from docshell/test/mochitest/file_bug728939.html
rename to docshell/test/file_bug728939.html

rename from docshell/test/mochitest/file_close_onpagehide1.html
rename to docshell/test/file_close_onpagehide1.html

rename from docshell/test/mochitest/file_close_onpagehide2.html
rename to docshell/test/file_close_onpagehide2.html

rename from docshell/test/mochitest/file_framedhistoryframes.html
rename to docshell/test/file_framedhistoryframes.html

rename from docshell/test/mochitest/file_pushState_after_document_open.html
rename to docshell/test/file_pushState_after_document_open.html

rename from docshell/test/mochitest/historyframes.html
rename to docshell/test/historyframes.html
--- a/docshell/test/mochitest/historyframes.html
+++ b/docshell/test/historyframes.html
@@ -45,17 +45,17 @@ function loadContent(aURL, aCallback) {
 function getURL() {
   return gFrame.contentDocument.documentURI;
 }
 
 function getContent() {
   return gFrame.contentDocument.getElementById("text").textContent;
 }
 
-var BASE_URI = "http://mochi.test:8888/tests/docshell/test/mochitest/";
+var BASE_URI = "http://mochi.test:8888/tests/docshell/test/";
 var START = BASE_URI + "start_historyframe.html";
 var URL1 = BASE_URI + "url1_historyframe.html";
 var URL2 = BASE_URI + "url2_historyframe.html";
 
 function run_test() {
   window.location.hash = "START";
 
   gFrame = document.getElementById("iframe");

deleted file mode 100644
--- a/docshell/test/iframesandbox/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/mochitest-test"
-  ]
-};

rename from docshell/test/mochitest/mochitest.ini
rename to docshell/test/mochitest.ini

deleted file mode 100644
--- a/docshell/test/mochitest/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/mochitest-test"
-  ]
-};

deleted file mode 100644
--- a/docshell/test/mochitest/file_bug598895_1.html
+++ /dev/null
@@ -1,1 +0,0 @@
-<script>window.onload = function() { opener.postMessage('loaded', '*'); }</script><body>Should show</body>

deleted file mode 100644
--- a/docshell/test/mochitest/file_bug598895_2.html
+++ /dev/null
@@ -1,1 +0,0 @@
-<script>window.onload = function() { opener.postMessage('loaded', '*'); }</script><body></body>

deleted file mode 100644
--- a/docshell/test/mochitest/file_bug653741.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body onload='(parent || opener).childLoad()'>
-
-<div style='height:500px; background:yellow'>
-<a id='#top'>Top of the page</a>
-</div>
-
-<div id='bottom'>
-<a id='#bottom'>Bottom of the page</a>
-</div>
-
-</body>
-</html>

rename from docshell/test/mochitest/moz.build
rename to docshell/test/moz.build
--- a/docshell/test/mochitest/moz.build
+++ b/docshell/test/moz.build
@@ -101,16 +101,19 @@ with Files('unit/*setUsePrivateBrowsing*
     BUG_COMPONENT = ('Firefox', 'Extension Compatibility')
 
 with Files('*1045096*'):
     BUG_COMPONENT = ('Core', 'DOM')
 
 with Files('*1151421*'):
     BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
+with Files('*369814*'):
+    BUG_COMPONENT = ('Core', 'Networking: JAR')
+
 with Files('*402210*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 with Files('*509055*'):
     BUG_COMPONENT = ('Core', 'History: Global')
 
 with Files('*511449*'):
     BUG_COMPONENT = ('Core', 'Widget: Cocoa')

deleted file mode 100644
--- a/docshell/test/navigation/.eslintrc.js
+++ /dev/null
@@ -1,8 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/browser-test",
-    "plugin:mozilla/mochitest-test",
-  ]
-};

rename from docshell/test/mochitest/start_historyframe.html
rename to docshell/test/start_historyframe.html

rename from docshell/test/mochitest/test_anchor_scroll_after_document_open.html
rename to docshell/test/test_anchor_scroll_after_document_open.html

rename from docshell/test/mochitest/test_bfcache_plus_hash.html
rename to docshell/test/test_bfcache_plus_hash.html

rename from docshell/test/mochitest/test_bug1045096.html
rename to docshell/test/test_bug1045096.html

rename from docshell/test/mochitest/test_bug1121701.html
rename to docshell/test/test_bug1121701.html

rename from docshell/test/mochitest/test_bug1151421.html
rename to docshell/test/test_bug1151421.html

rename from docshell/test/mochitest/test_bug1186774.html
rename to docshell/test/test_bug1186774.html

rename from docshell/test/mochitest/test_bug123696.html
rename to docshell/test/test_bug123696.html

rename from docshell/test/mochitest/test_bug1450164.html
rename to docshell/test/test_bug1450164.html

rename from docshell/test/mochitest/test_bug384014.html
rename to docshell/test/test_bug384014.html

rename from docshell/test/mochitest/test_bug385434.html
rename to docshell/test/test_bug385434.html

rename from docshell/test/mochitest/test_bug387979.html
rename to docshell/test/test_bug387979.html

rename from docshell/test/mochitest/test_bug402210.html
rename to docshell/test/test_bug402210.html

rename from docshell/test/mochitest/test_bug404548.html
rename to docshell/test/test_bug404548.html

rename from docshell/test/mochitest/test_bug413310.html
rename to docshell/test/test_bug413310.html

rename from docshell/test/mochitest/test_bug475636.html
rename to docshell/test/test_bug475636.html

rename from docshell/test/mochitest/test_bug509055.html
rename to docshell/test/test_bug509055.html

rename from docshell/test/mochitest/test_bug511449.html
rename to docshell/test/test_bug511449.html

rename from docshell/test/mochitest/test_bug529119-1.html
rename to docshell/test/test_bug529119-1.html
--- a/docshell/test/mochitest/test_bug529119-1.html
+++ b/docshell/test/test_bug529119-1.html
@@ -1,21 +1,21 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 <title>Test bug 529119</title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<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();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
+var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
 var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
 
 var w = null;
 var phase = 0;
 var gotWrongPageOnTryAgainClick = false;
 
 function pollForPage(f, w)
 {
@@ -28,17 +28,17 @@ function pollForPage(f, w)
 
       var haveErrorPage = false;
       try {
         var title = w.document.title;
       }
       catch (ex) {
         haveErrorPage = true;
       }
-
+  
       if (iterationsLeft == 0 || haveErrorPage) {
         window.clearInterval(int);
         f(iterationsLeft > 0);
       }
     }, 100);
   }, 1000);
 }
 
@@ -46,45 +46,45 @@ function windowLoaded()
 {
   switch (phase)
   {
     case 0:
       /* 2. We have succeededfully loaded a page, now go to a faulty URL */
       window.setTimeout(function() {
         w.location.href = faultyURL;
       }, 0);
-
+    
       phase = 1;
 
       pollForPage(function(succeeded) {
         ok(succeeded, "Waiting for error page succeeded");
-
-        /* 3. now, while we are on the error page, try to reload it, actually
+        
+        /* 3. now, while we are on the error page, try to reload it, actually 
            click the "Try Again" button */
         SpecialPowers.wrap(w).location.reload();
 
         pollForPage(function(succeeded) {
           ok(succeeded, "Waiting for error page succeeded");
-
+          
           /* 4-finish, check we are still on the error page */
           is(SpecialPowers.wrap(w).location.href, faultyURL, "Is on an error page");
           isnot(SpecialPowers.wrap(w).location.href, workingURL, "Is not on the previous page");
-          is(gotWrongPageOnTryAgainClick, false,
+          is(gotWrongPageOnTryAgainClick, false, 
             "Must not get www.example.com page on reload of an error page");
           w.close();
           SimpleTest.finish();
         }, w);
       }, w);
       break;
-
+      
     case 1:
       /* 4-check, we must not get here! */
       gotWrongPageOnTryAgainClick = true;
       break;
-  }
+  }             
 }
 
 function startTest()
 {
   /* 1. load a URL that leads to an error page */
   w = window.open(workingURL);
 }
 

rename from docshell/test/mochitest/test_bug529119-2.html
rename to docshell/test/test_bug529119-2.html
--- a/docshell/test/mochitest/test_bug529119-2.html
+++ b/docshell/test/test_bug529119-2.html
@@ -1,44 +1,44 @@
 <!DOCTYPE HTML>
 <html>
 <head>
 <title>Test bug 529119</title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+<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();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
+var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
 var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
 
 var w = null;
 var phase = 0;
 var isWindowLoaded = false;
 
 function pollForPage(expectErrorPage, f, w)
 {
   // Start with polling after a delay, we might mistakenly take the current page
   // as an expected one.
   window.setTimeout(function() {
     var iterationsLeft = 200;
     var int = window.setInterval(function() {
       iterationsLeft--;
-
+      
       var haveErrorPage = false;
       try {
         var title = w.document.title;
       }
       catch (ex) {
         haveErrorPage = true;
       }
-
+  
       if (iterationsLeft == 0 || expectErrorPage == haveErrorPage) {
         window.clearInterval(int);
         f(iterationsLeft > 0);
       }
     }, 100);
   }, 1000);
 }
 
@@ -46,17 +46,17 @@ function windowLoaded()
 {
   // The code under here should only be run once
   // The test popup window workingURL was already opened
   if (isWindowLoaded)
     return;
   isWindowLoaded = true;
 
   /* 2. We have successfully loaded a page, now go to a faulty URL */
-  // XXX The test fails when we change the location synchronously
+  // XXX The test fails when we change the location synchronously 
   window.setTimeout(function() {
     w.location.href = faultyURL;
   }, 0);
 
   pollForPage(true, function(succeeded) {
     ok(succeeded, "Waiting for error page succeeded");
     /* 3. now, while we are on the error page, navigate back */
     try {

rename from docshell/test/mochitest/test_bug530396.html
rename to docshell/test/test_bug530396.html
--- a/docshell/test/mochitest/test_bug530396.html
+++ b/docshell/test/test_bug530396.html
@@ -9,17 +9,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.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=530396">Mozilla Bug 530396</a>
 
 <p>
 
-<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/mochitest/bug530396-subframe.html"></iframe>
+<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/bug530396-subframe.html"></iframe>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 // NOTE: If we ever make subframes do bfcache stuff, this test will need to be
 // modified accordingly!  It assumes that subframes do NOT get bfcached.
 var onloadCount = 0;
 

rename from docshell/test/mochitest/test_bug540462.html
rename to docshell/test/test_bug540462.html

rename from docshell/test/mochitest/test_bug551225.html
rename to docshell/test/test_bug551225.html

rename from docshell/test/mochitest/test_bug570341.html
rename to docshell/test/test_bug570341.html

rename from docshell/test/mochitest/test_bug580069.html
rename to docshell/test/test_bug580069.html

rename from docshell/test/mochitest/test_bug590573.html
rename to docshell/test/test_bug590573.html

rename from docshell/test/mochitest/test_bug598895.html
rename to docshell/test/test_bug598895.html

rename from docshell/test/mochitest/test_bug634834.html
rename to docshell/test/test_bug634834.html

rename from docshell/test/mochitest/test_bug637644.html
rename to docshell/test/test_bug637644.html

rename from docshell/test/mochitest/test_bug640387_1.html
rename to docshell/test/test_bug640387_1.html

rename from docshell/test/mochitest/test_bug640387_2.html
rename to docshell/test/test_bug640387_2.html

rename from docshell/test/mochitest/test_bug653741.html
rename to docshell/test/test_bug653741.html

rename from docshell/test/mochitest/test_bug660404.html
rename to docshell/test/test_bug660404.html

rename from docshell/test/mochitest/test_bug662170.html
rename to docshell/test/test_bug662170.html

rename from docshell/test/mochitest/test_bug668513.html
rename to docshell/test/test_bug668513.html

rename from docshell/test/mochitest/test_bug669671.html
rename to docshell/test/test_bug669671.html

rename from docshell/test/mochitest/test_bug675587.html
rename to docshell/test/test_bug675587.html

rename from docshell/test/mochitest/test_bug680257.html
rename to docshell/test/test_bug680257.html

rename from docshell/test/mochitest/test_bug691547.html
rename to docshell/test/test_bug691547.html

rename from docshell/test/mochitest/test_bug694612.html
rename to docshell/test/test_bug694612.html

rename from docshell/test/mochitest/test_bug703855.html
rename to docshell/test/test_bug703855.html

rename from docshell/test/mochitest/test_bug728939.html
rename to docshell/test/test_bug728939.html

rename from docshell/test/mochitest/test_bug797909.html
rename to docshell/test/test_bug797909.html

rename from docshell/test/mochitest/test_close_onpagehide_by_history_back.html
rename to docshell/test/test_close_onpagehide_by_history_back.html

rename from docshell/test/mochitest/test_close_onpagehide_by_window_close.html
rename to docshell/test/test_close_onpagehide_by_window_close.html

rename from docshell/test/mochitest/test_forceinheritprincipal_overrule_owner.html
rename to docshell/test/test_forceinheritprincipal_overrule_owner.html

rename from docshell/test/mochitest/test_framedhistoryframes.html
rename to docshell/test/test_framedhistoryframes.html

rename from docshell/test/mochitest/test_pushState_after_document_open.html
rename to docshell/test/test_pushState_after_document_open.html
--- a/docshell/test/mochitest/test_pushState_after_document_open.html
+++ b/docshell/test/test_pushState_after_document_open.html
@@ -10,22 +10,20 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
 
   /** Test for Bug 957479 **/
   SimpleTest.waitForExplicitFinish();
   // Child needs to invoke us, otherwise our onload will fire before the child
   // has done the write/close bit.
   onmessage = function doTest() {
-    is(frames[0].location.pathname, "/tests/docshell/test/mochitest/file_pushState_after_document_open.html",
-       "Should have the right path here");
+    is(frames[0].location.pathname, "/tests/docshell/test/file_pushState_after_document_open.html", "Should have the right path here");
     is(frames[0].location.hash, "", "Should have the right hash here");
     frames[0].history.pushState({}, '', frames[0].document.URL + "#foopy");
-    is(frames[0].location.pathname, "/tests/docshell/test/mochitest/file_pushState_after_document_open.html",
-       "Pathname should not have changed");
+    is(frames[0].location.pathname, "/tests/docshell/test/file_pushState_after_document_open.html", "Pathname should not have changed");
     is(frames[0].location.hash, "#foopy", "Hash should have changed");
     SimpleTest.finish();
   }
 
   </script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=957479">Mozilla Bug 957479</a>

rename from docshell/test/mochitest/test_triggeringprincipal_location_seturi.html
rename to docshell/test/test_triggeringprincipal_location_seturi.html

rename from docshell/test/mochitest/test_windowedhistoryframes.html
rename to docshell/test/test_windowedhistoryframes.html

deleted file mode 100644
--- a/docshell/test/unit/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/xpcshell-test"
-  ]
-};

deleted file mode 100644
--- a/docshell/test/unit_ipc/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/xpcshell-test"
-  ]
-};

rename from docshell/test/mochitest/url1_historyframe.html
rename to docshell/test/url1_historyframe.html

rename from docshell/test/mochitest/url2_historyframe.html
rename to docshell/test/url2_historyframe.html