Bug 692625 - Move browser/components/sessionstore/test/browser/ to browser/components/sessionstore/test/; r=gavin
authorEd Morley <bmo@edmorley.co.uk>
Fri, 16 Dec 2011 09:11:21 +0000
changeset 82752 d24c34dbf1c8cb9ddf1d4a15d93a8b3c4b6723ab
parent 82751 54c446091d7c87a6ef6c4bd7026950adf2940dda
child 82753 4e4c03e4c37bf184990224d4ff9bfb2accada1ef
push id21695
push userbmo@edmorley.co.uk
push dateFri, 16 Dec 2011 11:53:06 +0000
treeherdermozilla-central@dcf6e5163e63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs692625
milestone11.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 692625 - Move browser/components/sessionstore/test/browser/ to browser/components/sessionstore/test/; r=gavin
browser/components/sessionstore/Makefile.in
browser/components/sessionstore/test/Makefile.in
browser/components/sessionstore/test/browser/Makefile.in
browser/components/sessionstore/test/browser/browser_248970_a.js
browser/components/sessionstore/test/browser/browser_248970_b.js
browser/components/sessionstore/test/browser/browser_248970_b_sample.html
browser/components/sessionstore/test/browser/browser_339445.js
browser/components/sessionstore/test/browser/browser_339445_sample.html
browser/components/sessionstore/test/browser/browser_345898.js
browser/components/sessionstore/test/browser/browser_346337.js
browser/components/sessionstore/test/browser/browser_346337_sample.html
browser/components/sessionstore/test/browser/browser_350525.js
browser/components/sessionstore/test/browser/browser_354894.js
browser/components/sessionstore/test/browser/browser_367052.js
browser/components/sessionstore/test/browser/browser_393716.js
browser/components/sessionstore/test/browser/browser_394759_basic.js
browser/components/sessionstore/test/browser/browser_394759_behavior.js
browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js
browser/components/sessionstore/test/browser/browser_394759_purge.js
browser/components/sessionstore/test/browser/browser_408470.js
browser/components/sessionstore/test/browser/browser_408470_sample.html
browser/components/sessionstore/test/browser/browser_423132.js
browser/components/sessionstore/test/browser/browser_423132_sample.html
browser/components/sessionstore/test/browser/browser_447951.js
browser/components/sessionstore/test/browser/browser_447951_sample.html
browser/components/sessionstore/test/browser/browser_448741.js
browser/components/sessionstore/test/browser/browser_454908.js
browser/components/sessionstore/test/browser/browser_454908_sample.html
browser/components/sessionstore/test/browser/browser_456342.js
browser/components/sessionstore/test/browser/browser_456342_sample.xhtml
browser/components/sessionstore/test/browser/browser_459906.js
browser/components/sessionstore/test/browser/browser_459906_empty.html
browser/components/sessionstore/test/browser/browser_459906_sample.html
browser/components/sessionstore/test/browser/browser_461634.js
browser/components/sessionstore/test/browser/browser_461743.js
browser/components/sessionstore/test/browser/browser_461743_sample.html
browser/components/sessionstore/test/browser/browser_463205.js
browser/components/sessionstore/test/browser/browser_463205_helper.html
browser/components/sessionstore/test/browser/browser_463205_sample.html
browser/components/sessionstore/test/browser/browser_463206.js
browser/components/sessionstore/test/browser/browser_463206_sample.html
browser/components/sessionstore/test/browser/browser_464199.js
browser/components/sessionstore/test/browser/browser_464620_a.html
browser/components/sessionstore/test/browser/browser_464620_a.js
browser/components/sessionstore/test/browser/browser_464620_b.html
browser/components/sessionstore/test/browser/browser_464620_b.js
browser/components/sessionstore/test/browser/browser_464620_xd.html
browser/components/sessionstore/test/browser/browser_465215.js
browser/components/sessionstore/test/browser/browser_465223.js
browser/components/sessionstore/test/browser/browser_466937.js
browser/components/sessionstore/test/browser/browser_466937_sample.html
browser/components/sessionstore/test/browser/browser_467409-backslashplosion.js
browser/components/sessionstore/test/browser/browser_477657.js
browser/components/sessionstore/test/browser/browser_480148.js
browser/components/sessionstore/test/browser/browser_480893.js
browser/components/sessionstore/test/browser/browser_483330.js
browser/components/sessionstore/test/browser/browser_485482.js
browser/components/sessionstore/test/browser/browser_485482_sample.html
browser/components/sessionstore/test/browser/browser_485563.js
browser/components/sessionstore/test/browser/browser_490040.js
browser/components/sessionstore/test/browser/browser_491168.js
browser/components/sessionstore/test/browser/browser_491577.js
browser/components/sessionstore/test/browser/browser_493467.js
browser/components/sessionstore/test/browser/browser_495495.js
browser/components/sessionstore/test/browser/browser_500328.js
browser/components/sessionstore/test/browser/browser_506482.js
browser/components/sessionstore/test/browser/browser_514751.js
browser/components/sessionstore/test/browser/browser_522375.js
browser/components/sessionstore/test/browser/browser_522545.js
browser/components/sessionstore/test/browser/browser_524745.js
browser/components/sessionstore/test/browser/browser_526613.js
browser/components/sessionstore/test/browser/browser_528776.js
browser/components/sessionstore/test/browser/browser_579868.js
browser/components/sessionstore/test/browser/browser_579879.js
browser/components/sessionstore/test/browser/browser_580512.js
browser/components/sessionstore/test/browser/browser_581593.js
browser/components/sessionstore/test/browser/browser_581937.js
browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
browser/components/sessionstore/test/browser/browser_586147.js
browser/components/sessionstore/test/browser/browser_588426.js
browser/components/sessionstore/test/browser/browser_589246.js
browser/components/sessionstore/test/browser/browser_590268.js
browser/components/sessionstore/test/browser/browser_590563.js
browser/components/sessionstore/test/browser/browser_595601-restore_hidden.js
browser/components/sessionstore/test/browser/browser_597071.js
browser/components/sessionstore/test/browser/browser_597315.js
browser/components/sessionstore/test/browser/browser_597315_a.html
browser/components/sessionstore/test/browser/browser_597315_b.html
browser/components/sessionstore/test/browser/browser_597315_c.html
browser/components/sessionstore/test/browser/browser_597315_c1.html
browser/components/sessionstore/test/browser/browser_597315_c2.html
browser/components/sessionstore/test/browser/browser_597315_index.html
browser/components/sessionstore/test/browser/browser_599909.js
browser/components/sessionstore/test/browser/browser_600545.js
browser/components/sessionstore/test/browser/browser_601955.js
browser/components/sessionstore/test/browser/browser_607016.js
browser/components/sessionstore/test/browser/browser_615394-SSWindowState_events.js
browser/components/sessionstore/test/browser/browser_618151.js
browser/components/sessionstore/test/browser/browser_623779.js
browser/components/sessionstore/test/browser/browser_624727.js
browser/components/sessionstore/test/browser/browser_625016.js
browser/components/sessionstore/test/browser/browser_625257.js
browser/components/sessionstore/test/browser/browser_628270.js
browser/components/sessionstore/test/browser/browser_635418.js
browser/components/sessionstore/test/browser/browser_636279.js
browser/components/sessionstore/test/browser/browser_644409-scratchpads.js
browser/components/sessionstore/test/browser/browser_645428.js
browser/components/sessionstore/test/browser/browser_659591.js
browser/components/sessionstore/test/browser/browser_662812.js
browser/components/sessionstore/test/browser/browser_665702-state_session.js
browser/components/sessionstore/test/browser/browser_682507.js
browser/components/sessionstore/test/browser/browser_687710.js
browser/components/sessionstore/test/browser/browser_687710_2.js
browser/components/sessionstore/test/browser/browser_694378.js
browser/components/sessionstore/test/browser/browser_705597.js
browser/components/sessionstore/test/browser/browser_form_restore_events.js
browser/components/sessionstore/test/browser/browser_form_restore_events_sample.html
browser/components/sessionstore/test/browser/head.js
browser/components/sessionstore/test/browser_248970_a.js
browser/components/sessionstore/test/browser_248970_b.js
browser/components/sessionstore/test/browser_248970_b_sample.html
browser/components/sessionstore/test/browser_339445.js
browser/components/sessionstore/test/browser_339445_sample.html
browser/components/sessionstore/test/browser_345898.js
browser/components/sessionstore/test/browser_346337.js
browser/components/sessionstore/test/browser_346337_sample.html
browser/components/sessionstore/test/browser_350525.js
browser/components/sessionstore/test/browser_354894.js
browser/components/sessionstore/test/browser_367052.js
browser/components/sessionstore/test/browser_393716.js
browser/components/sessionstore/test/browser_394759_basic.js
browser/components/sessionstore/test/browser_394759_behavior.js
browser/components/sessionstore/test/browser_394759_privatebrowsing.js
browser/components/sessionstore/test/browser_394759_purge.js
browser/components/sessionstore/test/browser_408470.js
browser/components/sessionstore/test/browser_408470_sample.html
browser/components/sessionstore/test/browser_423132.js
browser/components/sessionstore/test/browser_423132_sample.html
browser/components/sessionstore/test/browser_447951.js
browser/components/sessionstore/test/browser_447951_sample.html
browser/components/sessionstore/test/browser_448741.js
browser/components/sessionstore/test/browser_454908.js
browser/components/sessionstore/test/browser_454908_sample.html
browser/components/sessionstore/test/browser_456342.js
browser/components/sessionstore/test/browser_456342_sample.xhtml
browser/components/sessionstore/test/browser_459906.js
browser/components/sessionstore/test/browser_459906_empty.html
browser/components/sessionstore/test/browser_459906_sample.html
browser/components/sessionstore/test/browser_461634.js
browser/components/sessionstore/test/browser_461743.js
browser/components/sessionstore/test/browser_461743_sample.html
browser/components/sessionstore/test/browser_463205.js
browser/components/sessionstore/test/browser_463205_helper.html
browser/components/sessionstore/test/browser_463205_sample.html
browser/components/sessionstore/test/browser_463206.js
browser/components/sessionstore/test/browser_463206_sample.html
browser/components/sessionstore/test/browser_464199.js
browser/components/sessionstore/test/browser_464620_a.html
browser/components/sessionstore/test/browser_464620_a.js
browser/components/sessionstore/test/browser_464620_b.html
browser/components/sessionstore/test/browser_464620_b.js
browser/components/sessionstore/test/browser_464620_xd.html
browser/components/sessionstore/test/browser_465215.js
browser/components/sessionstore/test/browser_465223.js
browser/components/sessionstore/test/browser_466937.js
browser/components/sessionstore/test/browser_466937_sample.html
browser/components/sessionstore/test/browser_467409-backslashplosion.js
browser/components/sessionstore/test/browser_477657.js
browser/components/sessionstore/test/browser_480148.js
browser/components/sessionstore/test/browser_480893.js
browser/components/sessionstore/test/browser_483330.js
browser/components/sessionstore/test/browser_485482.js
browser/components/sessionstore/test/browser_485482_sample.html
browser/components/sessionstore/test/browser_485563.js
browser/components/sessionstore/test/browser_490040.js
browser/components/sessionstore/test/browser_491168.js
browser/components/sessionstore/test/browser_491577.js
browser/components/sessionstore/test/browser_493467.js
browser/components/sessionstore/test/browser_495495.js
browser/components/sessionstore/test/browser_500328.js
browser/components/sessionstore/test/browser_506482.js
browser/components/sessionstore/test/browser_514751.js
browser/components/sessionstore/test/browser_522375.js
browser/components/sessionstore/test/browser_522545.js
browser/components/sessionstore/test/browser_524745.js
browser/components/sessionstore/test/browser_526613.js
browser/components/sessionstore/test/browser_528776.js
browser/components/sessionstore/test/browser_579868.js
browser/components/sessionstore/test/browser_579879.js
browser/components/sessionstore/test/browser_580512.js
browser/components/sessionstore/test/browser_581593.js
browser/components/sessionstore/test/browser_581937.js
browser/components/sessionstore/test/browser_586068-cascaded_restore.js
browser/components/sessionstore/test/browser_586147.js
browser/components/sessionstore/test/browser_588426.js
browser/components/sessionstore/test/browser_589246.js
browser/components/sessionstore/test/browser_590268.js
browser/components/sessionstore/test/browser_590563.js
browser/components/sessionstore/test/browser_595601-restore_hidden.js
browser/components/sessionstore/test/browser_597071.js
browser/components/sessionstore/test/browser_597315.js
browser/components/sessionstore/test/browser_597315_a.html
browser/components/sessionstore/test/browser_597315_b.html
browser/components/sessionstore/test/browser_597315_c.html
browser/components/sessionstore/test/browser_597315_c1.html
browser/components/sessionstore/test/browser_597315_c2.html
browser/components/sessionstore/test/browser_597315_index.html
browser/components/sessionstore/test/browser_599909.js
browser/components/sessionstore/test/browser_600545.js
browser/components/sessionstore/test/browser_601955.js
browser/components/sessionstore/test/browser_607016.js
browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
browser/components/sessionstore/test/browser_618151.js
browser/components/sessionstore/test/browser_623779.js
browser/components/sessionstore/test/browser_624727.js
browser/components/sessionstore/test/browser_625016.js
browser/components/sessionstore/test/browser_625257.js
browser/components/sessionstore/test/browser_628270.js
browser/components/sessionstore/test/browser_635418.js
browser/components/sessionstore/test/browser_636279.js
browser/components/sessionstore/test/browser_644409-scratchpads.js
browser/components/sessionstore/test/browser_645428.js
browser/components/sessionstore/test/browser_659591.js
browser/components/sessionstore/test/browser_662812.js
browser/components/sessionstore/test/browser_665702-state_session.js
browser/components/sessionstore/test/browser_682507.js
browser/components/sessionstore/test/browser_687710.js
browser/components/sessionstore/test/browser_687710_2.js
browser/components/sessionstore/test/browser_694378.js
browser/components/sessionstore/test/browser_705597.js
browser/components/sessionstore/test/browser_form_restore_events.js
browser/components/sessionstore/test/browser_form_restore_events_sample.html
browser/components/sessionstore/test/head.js
--- a/browser/components/sessionstore/Makefile.in
+++ b/browser/components/sessionstore/Makefile.in
@@ -45,13 +45,11 @@ XPIDL_MODULE = sessionstore
 
 XPIDLSRCS = \
 	nsISessionStartup.idl \
 	nsISessionStore.idl \
   $(NULL)
 
 DIRS = src
 
-ifdef ENABLE_TESTS
-DIRS += test/browser
-endif
+TEST_DIRS = test
 
 include $(topsrcdir)/config/rules.mk
rename from browser/components/sessionstore/test/browser/Makefile.in
rename to browser/components/sessionstore/test/Makefile.in
--- a/browser/components/sessionstore/test/browser/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -31,21 +31,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/components/sessionstore/test/browser 
+relativesrcdir  = browser/components/sessionstore/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 # browser_506482.js is disabled because of frequent failures (bug 538672)
 # browser_526613.js is disabled because of frequent failures (bug 534489)
 
 _BROWSER_TEST_FILES = \
rename from browser/components/sessionstore/test/browser/browser_248970_a.js
rename to browser/components/sessionstore/test/browser_248970_a.js
rename from browser/components/sessionstore/test/browser/browser_248970_b.js
rename to browser/components/sessionstore/test/browser_248970_b.js
--- a/browser/components/sessionstore/test/browser/browser_248970_b.js
+++ b/browser/components/sessionstore/test/browser_248970_b.js
@@ -111,17 +111,17 @@ function test() {
 
   //////////////////////////////////////////////////////////////////
   // Test (B) : Session data restoration between modes            //
   //////////////////////////////////////////////////////////////////
 
   let rootDir = getRootDirectory(gTestPath);
   const testURL = rootDir + "browser_248970_b_sample.html";
   const testURL2 = "http://mochi.test:8888/browser/" +
-  "browser/components/sessionstore/test/browser/browser_248970_b_sample.html";
+  "browser/components/sessionstore/test/browser_248970_b_sample.html";
 
   // get closed tab count
   let count = ss.getClosedTabCount(window);
   let max_tabs_undo = gPrefService.getIntPref("browser.sessionstore.max_tabs_undo");
   ok(0 <= count && count <= max_tabs_undo,
     "getClosedTabCount should return zero or at most max_tabs_undo");
 
   // setup a state for tab (A) so we can check later that is restored
rename from browser/components/sessionstore/test/browser/browser_248970_b_sample.html
rename to browser/components/sessionstore/test/browser_248970_b_sample.html
rename from browser/components/sessionstore/test/browser/browser_339445.js
rename to browser/components/sessionstore/test/browser_339445.js
--- a/browser/components/sessionstore/test/browser/browser_339445.js
+++ b/browser/components/sessionstore/test/browser_339445.js
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 339445 **/
   
   waitForExplicitFinish();
   
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_339445_sample.html";
+    "browser/components/sessionstore/test/browser_339445_sample.html";
   
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     this.removeEventListener("load", arguments.callee, true);
     let doc = tab.linkedBrowser.contentDocument;
     is(doc.getElementById("storageTestItem").textContent, "PENDING",
        "sessionStorage value has been set");
     
rename from browser/components/sessionstore/test/browser/browser_339445_sample.html
rename to browser/components/sessionstore/test/browser_339445_sample.html
rename from browser/components/sessionstore/test/browser/browser_345898.js
rename to browser/components/sessionstore/test/browser_345898.js
rename from browser/components/sessionstore/test/browser/browser_346337.js
rename to browser/components/sessionstore/test/browser_346337.js
rename from browser/components/sessionstore/test/browser/browser_346337_sample.html
rename to browser/components/sessionstore/test/browser_346337_sample.html
rename from browser/components/sessionstore/test/browser/browser_350525.js
rename to browser/components/sessionstore/test/browser_350525.js
rename from browser/components/sessionstore/test/browser/browser_354894.js
rename to browser/components/sessionstore/test/browser_354894.js
rename from browser/components/sessionstore/test/browser/browser_367052.js
rename to browser/components/sessionstore/test/browser_367052.js
rename from browser/components/sessionstore/test/browser/browser_393716.js
rename to browser/components/sessionstore/test/browser_393716.js
rename from browser/components/sessionstore/test/browser/browser_394759_basic.js
rename to browser/components/sessionstore/test/browser_394759_basic.js
rename from browser/components/sessionstore/test/browser/browser_394759_behavior.js
rename to browser/components/sessionstore/test/browser_394759_behavior.js
rename from browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js
rename to browser/components/sessionstore/test/browser_394759_privatebrowsing.js
rename from browser/components/sessionstore/test/browser/browser_394759_purge.js
rename to browser/components/sessionstore/test/browser_394759_purge.js
rename from browser/components/sessionstore/test/browser/browser_408470.js
rename to browser/components/sessionstore/test/browser_408470.js
rename from browser/components/sessionstore/test/browser/browser_408470_sample.html
rename to browser/components/sessionstore/test/browser_408470_sample.html
rename from browser/components/sessionstore/test/browser/browser_423132.js
rename to browser/components/sessionstore/test/browser_423132.js
--- a/browser/components/sessionstore/test/browser/browser_423132.js
+++ b/browser/components/sessionstore/test/browser_423132.js
@@ -43,17 +43,17 @@ function test() {
   let cs = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
   cs.removeAll();
 
   // make sure that sessionstore.js can be forced to be created by setting
   // the interval pref to 0
   gPrefService.setIntPref("browser.sessionstore.interval", 0);
 
   const testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_423132_sample.html";
+    "browser/components/sessionstore/test/browser_423132_sample.html";
 
   // open a new window
   let newWin = openDialog(location, "_blank", "chrome,all,dialog=no", "about:blank");
 
   // make sure sessionstore saves the cookie data, then close the window
   newWin.addEventListener("load", function (aEvent) {
     newWin.removeEventListener("load", arguments.callee, false);
 
rename from browser/components/sessionstore/test/browser/browser_423132_sample.html
rename to browser/components/sessionstore/test/browser_423132_sample.html
rename from browser/components/sessionstore/test/browser/browser_447951.js
rename to browser/components/sessionstore/test/browser_447951.js
--- a/browser/components/sessionstore/test/browser/browser_447951.js
+++ b/browser/components/sessionstore/test/browser_447951.js
@@ -34,17 +34,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 447951 **/
   
   waitForExplicitFinish();
   const baseURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_447951_sample.html#";
+    "browser/components/sessionstore/test/browser_447951_sample.html#";
     
   let tab = gBrowser.addTab();
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
     
     let tabState = { entries: [] };
     let max_entries = gPrefService.getIntPref("browser.sessionhistory.max_entries");
     for (let i = 0; i < max_entries; i++)
rename from browser/components/sessionstore/test/browser/browser_447951_sample.html
rename to browser/components/sessionstore/test/browser_447951_sample.html
rename from browser/components/sessionstore/test/browser/browser_448741.js
rename to browser/components/sessionstore/test/browser_448741.js
rename from browser/components/sessionstore/test/browser/browser_454908.js
rename to browser/components/sessionstore/test/browser_454908.js
rename from browser/components/sessionstore/test/browser/browser_454908_sample.html
rename to browser/components/sessionstore/test/browser_454908_sample.html
rename from browser/components/sessionstore/test/browser/browser_456342.js
rename to browser/components/sessionstore/test/browser_456342.js
rename from browser/components/sessionstore/test/browser/browser_456342_sample.xhtml
rename to browser/components/sessionstore/test/browser_456342_sample.xhtml
rename from browser/components/sessionstore/test/browser/browser_459906.js
rename to browser/components/sessionstore/test/browser_459906.js
--- a/browser/components/sessionstore/test/browser/browser_459906.js
+++ b/browser/components/sessionstore/test/browser_459906.js
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 459906 **/
 
   waitForExplicitFinish();
 
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_459906_sample.html";
+    "browser/components/sessionstore/test/browser_459906_sample.html";
   let uniqueValue = "<b>Unique:</b> " + Date.now();
 
   var frameCount = 0;
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     // wait for all frames to load completely
     if (frameCount++ < 2)
       return;
rename from browser/components/sessionstore/test/browser/browser_459906_empty.html
rename to browser/components/sessionstore/test/browser_459906_empty.html
rename from browser/components/sessionstore/test/browser/browser_459906_sample.html
rename to browser/components/sessionstore/test/browser_459906_sample.html
rename from browser/components/sessionstore/test/browser/browser_461634.js
rename to browser/components/sessionstore/test/browser_461634.js
rename from browser/components/sessionstore/test/browser/browser_461743.js
rename to browser/components/sessionstore/test/browser_461743.js
--- a/browser/components/sessionstore/test/browser/browser_461743.js
+++ b/browser/components/sessionstore/test/browser_461743.js
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 461743 **/
 
   waitForExplicitFinish();
 
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_461743_sample.html";
+    "browser/components/sessionstore/test/browser_461743_sample.html";
 
   let frameCount = 0;
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     // Wait for all frames to load completely.
     if (frameCount++ < 2)
       return;
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
rename from browser/components/sessionstore/test/browser/browser_461743_sample.html
rename to browser/components/sessionstore/test/browser_461743_sample.html
rename from browser/components/sessionstore/test/browser/browser_463205.js
rename to browser/components/sessionstore/test/browser_463205.js
--- a/browser/components/sessionstore/test/browser/browser_463205.js
+++ b/browser/components/sessionstore/test/browser_463205.js
@@ -93,17 +93,17 @@ function test() {
     
     let uniqueValue = "Unique: " + Math.random();
     let win = tab.linkedBrowser.contentWindow;
     typeText(win.frames[0].document.getElementById("original"), uniqueValue);
     typeText(win.frames[1].document.getElementById("original"), uniqueValue);
 
     mainURL = testURL;
     frame1URL = "http://mochi.test:8888/browser/" +
-      "browser/components/sessionstore/test/browser/browser_463205_helper.html";
+      "browser/components/sessionstore/test/browser_463205_helper.html";
     frame2URL = rootDir + "browser_463205_helper.html";
     frame3URL = "data:text/html,mark2";
 
     frameCount = 0;
 
     let tab2 = gBrowser.duplicateTab(tab);
     tab2.linkedBrowser.addEventListener("load", function(aEvent) {
       // wait for all frames to load (and reload!) completely
rename from browser/components/sessionstore/test/browser/browser_463205_helper.html
rename to browser/components/sessionstore/test/browser_463205_helper.html
rename from browser/components/sessionstore/test/browser/browser_463205_sample.html
rename to browser/components/sessionstore/test/browser_463205_sample.html
--- a/browser/components/sessionstore/test/browser/browser_463205_sample.html
+++ b/browser/components/sessionstore/test/browser_463205_sample.html
@@ -13,13 +13,13 @@
     frames[2].removeEventListener("DOMContentLoaded", arguments.callee, false);
     
     if (frames[2].document.location.href == "data:text/html,mark1") {
       frames[2].document.location = "data:text/html,mark2";
     }
     else {
       frames[1].document.location.hash = "#original";
       frames[0].document.location = "http://mochi.test:8888/browser/" +
-        "browser/components/sessionstore/test/browser/browser_463205_helper.html";
+        "browser/components/sessionstore/test/browser_463205_helper.html";
     }
   }, false);
 </script>
 </body>
rename from browser/components/sessionstore/test/browser/browser_463206.js
rename to browser/components/sessionstore/test/browser_463206.js
--- a/browser/components/sessionstore/test/browser/browser_463206.js
+++ b/browser/components/sessionstore/test/browser_463206.js
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 463206 **/
   
   waitForExplicitFinish();
   
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_463206_sample.html";
+    "browser/components/sessionstore/test/browser_463206_sample.html";
   
   var frameCount = 0;
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     // wait for all frames to load completely
     if (frameCount++ < 5)
       return;
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
rename from browser/components/sessionstore/test/browser/browser_463206_sample.html
rename to browser/components/sessionstore/test/browser_463206_sample.html
rename from browser/components/sessionstore/test/browser/browser_464199.js
rename to browser/components/sessionstore/test/browser_464199.js
rename from browser/components/sessionstore/test/browser/browser_464620_a.html
rename to browser/components/sessionstore/test/browser_464620_a.html
--- a/browser/components/sessionstore/test/browser/browser_464620_a.html
+++ b/browser/components/sessionstore/test/browser_464620_a.html
@@ -2,17 +2,17 @@
 
 <title>Test for bug 464620 (injection on input)</title>
 
 <iframe></iframe>
 <iframe onload="setup()"></iframe>
 
 <script>
   var targetUrl = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_464620_xd.html";
+    "browser/components/sessionstore/test/browser_464620_xd.html";
   var firstPass;
   
   function setup() {
     if (firstPass !== undefined)
       return;
     firstPass = frames[1].location.href == "about:blank";
     if (firstPass) {
       frames[0].location = 'data:text/html,<body onload="if (parent.firstPass) parent.step();"><input id="x" oninput="parent.xss()">XXX</body>';
rename from browser/components/sessionstore/test/browser/browser_464620_a.js
rename to browser/components/sessionstore/test/browser_464620_a.js
--- a/browser/components/sessionstore/test/browser/browser_464620_a.js
+++ b/browser/components/sessionstore/test/browser_464620_a.js
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 464620 (injection on input) **/
   
   waitForExplicitFinish();
   
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_464620_a.html";
+    "browser/components/sessionstore/test/browser_464620_a.html";
   
   var frameCount = 0;
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     // wait for all frames to load completely
     if (frameCount++ < 4)
       return;
     this.removeEventListener("load", arguments.callee, true);
rename from browser/components/sessionstore/test/browser/browser_464620_b.html
rename to browser/components/sessionstore/test/browser_464620_b.html
--- a/browser/components/sessionstore/test/browser/browser_464620_b.html
+++ b/browser/components/sessionstore/test/browser_464620_b.html
@@ -3,17 +3,17 @@
 <title>Test for bug 464620 (injection on DOM node insertion)</title>
 
 <iframe></iframe>
 <iframe></iframe>
 <iframe onload="setup()"></iframe>
 
 <script>
   var targetUrl = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_464620_xd.html";
+    "browser/components/sessionstore/test/browser_464620_xd.html";
   var firstPass;
   
   function setup() {
     if (firstPass !== undefined)
       return;
     firstPass = frames[2].location.href == "about:blank";
     if (firstPass) {
       frames[0].location = 'data:text/html,<body onload="parent.step()">a</body>';
rename from browser/components/sessionstore/test/browser/browser_464620_b.js
rename to browser/components/sessionstore/test/browser_464620_b.js
--- a/browser/components/sessionstore/test/browser/browser_464620_b.js
+++ b/browser/components/sessionstore/test/browser_464620_b.js
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 function test() {
   /** Test for Bug 464620 (injection on DOM node insertion) **/
   
   waitForExplicitFinish();
   
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_464620_b.html";
+    "browser/components/sessionstore/test/browser_464620_b.html";
   
   var frameCount = 0;
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     // wait for all frames to load completely
     if (frameCount++ < 6)
       return;
     this.removeEventListener("load", arguments.callee, true);
rename from browser/components/sessionstore/test/browser/browser_464620_xd.html
rename to browser/components/sessionstore/test/browser_464620_xd.html
rename from browser/components/sessionstore/test/browser/browser_465215.js
rename to browser/components/sessionstore/test/browser_465215.js
rename from browser/components/sessionstore/test/browser/browser_465223.js
rename to browser/components/sessionstore/test/browser_465223.js
rename from browser/components/sessionstore/test/browser/browser_466937.js
rename to browser/components/sessionstore/test/browser_466937.js
--- a/browser/components/sessionstore/test/browser/browser_466937.js
+++ b/browser/components/sessionstore/test/browser_466937.js
@@ -42,17 +42,17 @@ function test() {
   var file = Components.classes["@mozilla.org/file/directory_service;1"]
              .getService(Components.interfaces.nsIProperties)
              .get("TmpD", Components.interfaces.nsILocalFile);
   file.append("466937_test.file");
   file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0666);
   let testPath = file.path;
   
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_466937_sample.html";
+    "browser/components/sessionstore/test/browser_466937_sample.html";
   
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
     let doc = tab.linkedBrowser.contentDocument;
     doc.getElementById("reverse_thief").value = "/home/user/secret2";
     doc.getElementById("bystander").value = testPath;
     
rename from browser/components/sessionstore/test/browser/browser_466937_sample.html
rename to browser/components/sessionstore/test/browser_466937_sample.html
rename from browser/components/sessionstore/test/browser/browser_467409-backslashplosion.js
rename to browser/components/sessionstore/test/browser_467409-backslashplosion.js
rename from browser/components/sessionstore/test/browser/browser_477657.js
rename to browser/components/sessionstore/test/browser_477657.js
rename from browser/components/sessionstore/test/browser/browser_480148.js
rename to browser/components/sessionstore/test/browser_480148.js
rename from browser/components/sessionstore/test/browser/browser_480893.js
rename to browser/components/sessionstore/test/browser_480893.js
rename from browser/components/sessionstore/test/browser/browser_483330.js
rename to browser/components/sessionstore/test/browser_483330.js
rename from browser/components/sessionstore/test/browser/browser_485482.js
rename to browser/components/sessionstore/test/browser_485482.js
rename from browser/components/sessionstore/test/browser/browser_485482_sample.html
rename to browser/components/sessionstore/test/browser_485482_sample.html
rename from browser/components/sessionstore/test/browser/browser_485563.js
rename to browser/components/sessionstore/test/browser_485563.js
rename from browser/components/sessionstore/test/browser/browser_490040.js
rename to browser/components/sessionstore/test/browser_490040.js
rename from browser/components/sessionstore/test/browser/browser_491168.js
rename to browser/components/sessionstore/test/browser_491168.js
rename from browser/components/sessionstore/test/browser/browser_491577.js
rename to browser/components/sessionstore/test/browser_491577.js
rename from browser/components/sessionstore/test/browser/browser_493467.js
rename to browser/components/sessionstore/test/browser_493467.js
rename from browser/components/sessionstore/test/browser/browser_495495.js
rename to browser/components/sessionstore/test/browser_495495.js
rename from browser/components/sessionstore/test/browser/browser_500328.js
rename to browser/components/sessionstore/test/browser_500328.js
rename from browser/components/sessionstore/test/browser/browser_506482.js
rename to browser/components/sessionstore/test/browser_506482.js
rename from browser/components/sessionstore/test/browser/browser_514751.js
rename to browser/components/sessionstore/test/browser_514751.js
rename from browser/components/sessionstore/test/browser/browser_522375.js
rename to browser/components/sessionstore/test/browser_522375.js
rename from browser/components/sessionstore/test/browser/browser_522545.js
rename to browser/components/sessionstore/test/browser_522545.js
rename from browser/components/sessionstore/test/browser/browser_524745.js
rename to browser/components/sessionstore/test/browser_524745.js
rename from browser/components/sessionstore/test/browser/browser_526613.js
rename to browser/components/sessionstore/test/browser_526613.js
rename from browser/components/sessionstore/test/browser/browser_528776.js
rename to browser/components/sessionstore/test/browser_528776.js
rename from browser/components/sessionstore/test/browser/browser_579868.js
rename to browser/components/sessionstore/test/browser_579868.js
rename from browser/components/sessionstore/test/browser/browser_579879.js
rename to browser/components/sessionstore/test/browser_579879.js
rename from browser/components/sessionstore/test/browser/browser_580512.js
rename to browser/components/sessionstore/test/browser_580512.js
rename from browser/components/sessionstore/test/browser/browser_581593.js
rename to browser/components/sessionstore/test/browser_581593.js
rename from browser/components/sessionstore/test/browser/browser_581937.js
rename to browser/components/sessionstore/test/browser_581937.js
rename from browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
rename to browser/components/sessionstore/test/browser_586068-cascaded_restore.js
rename from browser/components/sessionstore/test/browser/browser_586147.js
rename to browser/components/sessionstore/test/browser_586147.js
rename from browser/components/sessionstore/test/browser/browser_588426.js
rename to browser/components/sessionstore/test/browser_588426.js
rename from browser/components/sessionstore/test/browser/browser_589246.js
rename to browser/components/sessionstore/test/browser_589246.js
rename from browser/components/sessionstore/test/browser/browser_590268.js
rename to browser/components/sessionstore/test/browser_590268.js
rename from browser/components/sessionstore/test/browser/browser_590563.js
rename to browser/components/sessionstore/test/browser_590563.js
rename from browser/components/sessionstore/test/browser/browser_595601-restore_hidden.js
rename to browser/components/sessionstore/test/browser_595601-restore_hidden.js
rename from browser/components/sessionstore/test/browser/browser_597071.js
rename to browser/components/sessionstore/test/browser_597071.js
rename from browser/components/sessionstore/test/browser/browser_597315.js
rename to browser/components/sessionstore/test/browser_597315.js
rename from browser/components/sessionstore/test/browser/browser_597315_a.html
rename to browser/components/sessionstore/test/browser_597315_a.html
rename from browser/components/sessionstore/test/browser/browser_597315_b.html
rename to browser/components/sessionstore/test/browser_597315_b.html
rename from browser/components/sessionstore/test/browser/browser_597315_c.html
rename to browser/components/sessionstore/test/browser_597315_c.html
rename from browser/components/sessionstore/test/browser/browser_597315_c1.html
rename to browser/components/sessionstore/test/browser_597315_c1.html
rename from browser/components/sessionstore/test/browser/browser_597315_c2.html
rename to browser/components/sessionstore/test/browser_597315_c2.html
rename from browser/components/sessionstore/test/browser/browser_597315_index.html
rename to browser/components/sessionstore/test/browser_597315_index.html
rename from browser/components/sessionstore/test/browser/browser_599909.js
rename to browser/components/sessionstore/test/browser_599909.js
rename from browser/components/sessionstore/test/browser/browser_600545.js
rename to browser/components/sessionstore/test/browser_600545.js
rename from browser/components/sessionstore/test/browser/browser_601955.js
rename to browser/components/sessionstore/test/browser_601955.js
rename from browser/components/sessionstore/test/browser/browser_607016.js
rename to browser/components/sessionstore/test/browser_607016.js
rename from browser/components/sessionstore/test/browser/browser_615394-SSWindowState_events.js
rename to browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
rename from browser/components/sessionstore/test/browser/browser_618151.js
rename to browser/components/sessionstore/test/browser_618151.js
rename from browser/components/sessionstore/test/browser/browser_623779.js
rename to browser/components/sessionstore/test/browser_623779.js
rename from browser/components/sessionstore/test/browser/browser_624727.js
rename to browser/components/sessionstore/test/browser_624727.js
rename from browser/components/sessionstore/test/browser/browser_625016.js
rename to browser/components/sessionstore/test/browser_625016.js
rename from browser/components/sessionstore/test/browser/browser_625257.js
rename to browser/components/sessionstore/test/browser_625257.js
rename from browser/components/sessionstore/test/browser/browser_628270.js
rename to browser/components/sessionstore/test/browser_628270.js
rename from browser/components/sessionstore/test/browser/browser_635418.js
rename to browser/components/sessionstore/test/browser_635418.js
rename from browser/components/sessionstore/test/browser/browser_636279.js
rename to browser/components/sessionstore/test/browser_636279.js
rename from browser/components/sessionstore/test/browser/browser_644409-scratchpads.js
rename to browser/components/sessionstore/test/browser_644409-scratchpads.js
rename from browser/components/sessionstore/test/browser/browser_645428.js
rename to browser/components/sessionstore/test/browser_645428.js
rename from browser/components/sessionstore/test/browser/browser_659591.js
rename to browser/components/sessionstore/test/browser_659591.js
rename from browser/components/sessionstore/test/browser/browser_662812.js
rename to browser/components/sessionstore/test/browser_662812.js
rename from browser/components/sessionstore/test/browser/browser_665702-state_session.js
rename to browser/components/sessionstore/test/browser_665702-state_session.js
rename from browser/components/sessionstore/test/browser/browser_682507.js
rename to browser/components/sessionstore/test/browser_682507.js
rename from browser/components/sessionstore/test/browser/browser_687710.js
rename to browser/components/sessionstore/test/browser_687710.js
rename from browser/components/sessionstore/test/browser/browser_687710_2.js
rename to browser/components/sessionstore/test/browser_687710_2.js
rename from browser/components/sessionstore/test/browser/browser_694378.js
rename to browser/components/sessionstore/test/browser_694378.js
rename from browser/components/sessionstore/test/browser/browser_705597.js
rename to browser/components/sessionstore/test/browser_705597.js
rename from browser/components/sessionstore/test/browser/browser_form_restore_events.js
rename to browser/components/sessionstore/test/browser_form_restore_events.js
--- a/browser/components/sessionstore/test/browser/browser_form_restore_events.js
+++ b/browser/components/sessionstore/test/browser_form_restore_events.js
@@ -39,17 +39,17 @@ function test() {
 
   waitForExplicitFinish();
 
   let file = Components.classes["@mozilla.org/file/directory_service;1"]
              .getService(Components.interfaces.nsIProperties)
              .get("TmpD", Components.interfaces.nsIFile);
 
   let testURL = "http://mochi.test:8888/browser/" +
-    "browser/components/sessionstore/test/browser/browser_form_restore_events_sample.html";
+    "browser/components/sessionstore/test/browser_form_restore_events_sample.html";
   let tab = gBrowser.addTab(testURL);
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
     let doc = tab.linkedBrowser.contentDocument;
 
     // text fields
     doc.getElementById("modify01").value += Math.random();
     doc.getElementById("modify02").value += " " + Date.now();
rename from browser/components/sessionstore/test/browser/browser_form_restore_events_sample.html
rename to browser/components/sessionstore/test/browser_form_restore_events_sample.html
rename from browser/components/sessionstore/test/browser/head.js
rename to browser/components/sessionstore/test/head.js