From d052ca001addcf589144c5140b4ab588ad3bfcf4 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 16 Dec 2011 09:11:21 +0000
Subject: [PATCH] Bug 692625 - Move
 browser/components/sessionstore/test/browser/ to
 browser/components/sessionstore/test/; r=gavin

--HG--
rename : browser/components/sessionstore/test/browser/Makefile.in => browser/components/sessionstore/test/Makefile.in
rename : browser/components/sessionstore/test/browser/browser_248970_a.js => browser/components/sessionstore/test/browser_248970_a.js
rename : browser/components/sessionstore/test/browser/browser_248970_b.js => browser/components/sessionstore/test/browser_248970_b.js
rename : browser/components/sessionstore/test/browser/browser_248970_b_sample.html => browser/components/sessionstore/test/browser_248970_b_sample.html
rename : browser/components/sessionstore/test/browser/browser_339445.js => browser/components/sessionstore/test/browser_339445.js
rename : browser/components/sessionstore/test/browser/browser_339445_sample.html => browser/components/sessionstore/test/browser_339445_sample.html
rename : browser/components/sessionstore/test/browser/browser_345898.js => browser/components/sessionstore/test/browser_345898.js
rename : browser/components/sessionstore/test/browser/browser_346337.js => browser/components/sessionstore/test/browser_346337.js
rename : browser/components/sessionstore/test/browser/browser_346337_sample.html => browser/components/sessionstore/test/browser_346337_sample.html
rename : browser/components/sessionstore/test/browser/browser_350525.js => browser/components/sessionstore/test/browser_350525.js
rename : browser/components/sessionstore/test/browser/browser_354894.js => browser/components/sessionstore/test/browser_354894.js
rename : browser/components/sessionstore/test/browser/browser_367052.js => browser/components/sessionstore/test/browser_367052.js
rename : browser/components/sessionstore/test/browser/browser_393716.js => browser/components/sessionstore/test/browser_393716.js
rename : browser/components/sessionstore/test/browser/browser_394759_basic.js => browser/components/sessionstore/test/browser_394759_basic.js
rename : browser/components/sessionstore/test/browser/browser_394759_behavior.js => browser/components/sessionstore/test/browser_394759_behavior.js
rename : browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js => browser/components/sessionstore/test/browser_394759_privatebrowsing.js
rename : browser/components/sessionstore/test/browser/browser_394759_purge.js => browser/components/sessionstore/test/browser_394759_purge.js
rename : browser/components/sessionstore/test/browser/browser_408470.js => browser/components/sessionstore/test/browser_408470.js
rename : browser/components/sessionstore/test/browser/browser_408470_sample.html => browser/components/sessionstore/test/browser_408470_sample.html
rename : browser/components/sessionstore/test/browser/browser_423132.js => browser/components/sessionstore/test/browser_423132.js
rename : browser/components/sessionstore/test/browser/browser_423132_sample.html => browser/components/sessionstore/test/browser_423132_sample.html
rename : browser/components/sessionstore/test/browser/browser_447951.js => browser/components/sessionstore/test/browser_447951.js
rename : browser/components/sessionstore/test/browser/browser_447951_sample.html => browser/components/sessionstore/test/browser_447951_sample.html
rename : browser/components/sessionstore/test/browser/browser_448741.js => browser/components/sessionstore/test/browser_448741.js
rename : browser/components/sessionstore/test/browser/browser_454908.js => browser/components/sessionstore/test/browser_454908.js
rename : browser/components/sessionstore/test/browser/browser_454908_sample.html => browser/components/sessionstore/test/browser_454908_sample.html
rename : browser/components/sessionstore/test/browser/browser_456342.js => browser/components/sessionstore/test/browser_456342.js
rename : browser/components/sessionstore/test/browser/browser_456342_sample.xhtml => browser/components/sessionstore/test/browser_456342_sample.xhtml
rename : browser/components/sessionstore/test/browser/browser_459906.js => browser/components/sessionstore/test/browser_459906.js
rename : browser/components/sessionstore/test/browser/browser_459906_empty.html => browser/components/sessionstore/test/browser_459906_empty.html
rename : browser/components/sessionstore/test/browser/browser_459906_sample.html => browser/components/sessionstore/test/browser_459906_sample.html
rename : browser/components/sessionstore/test/browser/browser_461634.js => browser/components/sessionstore/test/browser_461634.js
rename : browser/components/sessionstore/test/browser/browser_461743.js => browser/components/sessionstore/test/browser_461743.js
rename : browser/components/sessionstore/test/browser/browser_461743_sample.html => browser/components/sessionstore/test/browser_461743_sample.html
rename : browser/components/sessionstore/test/browser/browser_463205.js => browser/components/sessionstore/test/browser_463205.js
rename : browser/components/sessionstore/test/browser/browser_463205_helper.html => browser/components/sessionstore/test/browser_463205_helper.html
rename : browser/components/sessionstore/test/browser/browser_463205_sample.html => browser/components/sessionstore/test/browser_463205_sample.html
rename : browser/components/sessionstore/test/browser/browser_463206.js => browser/components/sessionstore/test/browser_463206.js
rename : browser/components/sessionstore/test/browser/browser_463206_sample.html => browser/components/sessionstore/test/browser_463206_sample.html
rename : browser/components/sessionstore/test/browser/browser_464199.js => browser/components/sessionstore/test/browser_464199.js
rename : browser/components/sessionstore/test/browser/browser_464620_a.html => browser/components/sessionstore/test/browser_464620_a.html
rename : browser/components/sessionstore/test/browser/browser_464620_a.js => browser/components/sessionstore/test/browser_464620_a.js
rename : browser/components/sessionstore/test/browser/browser_464620_b.html => browser/components/sessionstore/test/browser_464620_b.html
rename : browser/components/sessionstore/test/browser/browser_464620_b.js => browser/components/sessionstore/test/browser_464620_b.js
rename : browser/components/sessionstore/test/browser/browser_464620_xd.html => browser/components/sessionstore/test/browser_464620_xd.html
rename : browser/components/sessionstore/test/browser/browser_465215.js => browser/components/sessionstore/test/browser_465215.js
rename : browser/components/sessionstore/test/browser/browser_465223.js => browser/components/sessionstore/test/browser_465223.js
rename : browser/components/sessionstore/test/browser/browser_466937.js => browser/components/sessionstore/test/browser_466937.js
rename : browser/components/sessionstore/test/browser/browser_466937_sample.html => browser/components/sessionstore/test/browser_466937_sample.html
rename : browser/components/sessionstore/test/browser/browser_467409-backslashplosion.js => browser/components/sessionstore/test/browser_467409-backslashplosion.js
rename : browser/components/sessionstore/test/browser/browser_477657.js => browser/components/sessionstore/test/browser_477657.js
rename : browser/components/sessionstore/test/browser/browser_480148.js => browser/components/sessionstore/test/browser_480148.js
rename : browser/components/sessionstore/test/browser/browser_480893.js => browser/components/sessionstore/test/browser_480893.js
rename : browser/components/sessionstore/test/browser/browser_483330.js => browser/components/sessionstore/test/browser_483330.js
rename : browser/components/sessionstore/test/browser/browser_485482.js => browser/components/sessionstore/test/browser_485482.js
rename : browser/components/sessionstore/test/browser/browser_485482_sample.html => browser/components/sessionstore/test/browser_485482_sample.html
rename : browser/components/sessionstore/test/browser/browser_485563.js => browser/components/sessionstore/test/browser_485563.js
rename : browser/components/sessionstore/test/browser/browser_490040.js => browser/components/sessionstore/test/browser_490040.js
rename : browser/components/sessionstore/test/browser/browser_491168.js => browser/components/sessionstore/test/browser_491168.js
rename : browser/components/sessionstore/test/browser/browser_491577.js => browser/components/sessionstore/test/browser_491577.js
rename : browser/components/sessionstore/test/browser/browser_493467.js => browser/components/sessionstore/test/browser_493467.js
rename : browser/components/sessionstore/test/browser/browser_495495.js => browser/components/sessionstore/test/browser_495495.js
rename : browser/components/sessionstore/test/browser/browser_500328.js => browser/components/sessionstore/test/browser_500328.js
rename : browser/components/sessionstore/test/browser/browser_506482.js => browser/components/sessionstore/test/browser_506482.js
rename : browser/components/sessionstore/test/browser/browser_514751.js => browser/components/sessionstore/test/browser_514751.js
rename : browser/components/sessionstore/test/browser/browser_522375.js => browser/components/sessionstore/test/browser_522375.js
rename : browser/components/sessionstore/test/browser/browser_522545.js => browser/components/sessionstore/test/browser_522545.js
rename : browser/components/sessionstore/test/browser/browser_524745.js => browser/components/sessionstore/test/browser_524745.js
rename : browser/components/sessionstore/test/browser/browser_526613.js => browser/components/sessionstore/test/browser_526613.js
rename : browser/components/sessionstore/test/browser/browser_528776.js => browser/components/sessionstore/test/browser_528776.js
rename : browser/components/sessionstore/test/browser/browser_579868.js => browser/components/sessionstore/test/browser_579868.js
rename : browser/components/sessionstore/test/browser/browser_579879.js => browser/components/sessionstore/test/browser_579879.js
rename : browser/components/sessionstore/test/browser/browser_580512.js => browser/components/sessionstore/test/browser_580512.js
rename : browser/components/sessionstore/test/browser/browser_581593.js => browser/components/sessionstore/test/browser_581593.js
rename : browser/components/sessionstore/test/browser/browser_581937.js => browser/components/sessionstore/test/browser_581937.js
rename : browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js => browser/components/sessionstore/test/browser_586068-cascaded_restore.js
rename : browser/components/sessionstore/test/browser/browser_586147.js => browser/components/sessionstore/test/browser_586147.js
rename : browser/components/sessionstore/test/browser/browser_588426.js => browser/components/sessionstore/test/browser_588426.js
rename : browser/components/sessionstore/test/browser/browser_589246.js => browser/components/sessionstore/test/browser_589246.js
rename : browser/components/sessionstore/test/browser/browser_590268.js => browser/components/sessionstore/test/browser_590268.js
rename : browser/components/sessionstore/test/browser/browser_590563.js => browser/components/sessionstore/test/browser_590563.js
rename : browser/components/sessionstore/test/browser/browser_595601-restore_hidden.js => browser/components/sessionstore/test/browser_595601-restore_hidden.js
rename : browser/components/sessionstore/test/browser/browser_597071.js => browser/components/sessionstore/test/browser_597071.js
rename : browser/components/sessionstore/test/browser/browser_597315.js => browser/components/sessionstore/test/browser_597315.js
rename : browser/components/sessionstore/test/browser/browser_597315_a.html => browser/components/sessionstore/test/browser_597315_a.html
rename : browser/components/sessionstore/test/browser/browser_597315_b.html => browser/components/sessionstore/test/browser_597315_b.html
rename : browser/components/sessionstore/test/browser/browser_597315_c.html => browser/components/sessionstore/test/browser_597315_c.html
rename : browser/components/sessionstore/test/browser/browser_597315_c1.html => browser/components/sessionstore/test/browser_597315_c1.html
rename : browser/components/sessionstore/test/browser/browser_597315_c2.html => browser/components/sessionstore/test/browser_597315_c2.html
rename : browser/components/sessionstore/test/browser/browser_597315_index.html => browser/components/sessionstore/test/browser_597315_index.html
rename : browser/components/sessionstore/test/browser/browser_599909.js => browser/components/sessionstore/test/browser_599909.js
rename : browser/components/sessionstore/test/browser/browser_600545.js => browser/components/sessionstore/test/browser_600545.js
rename : browser/components/sessionstore/test/browser/browser_601955.js => browser/components/sessionstore/test/browser_601955.js
rename : browser/components/sessionstore/test/browser/browser_607016.js => browser/components/sessionstore/test/browser_607016.js
rename : browser/components/sessionstore/test/browser/browser_615394-SSWindowState_events.js => browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
rename : browser/components/sessionstore/test/browser/browser_618151.js => browser/components/sessionstore/test/browser_618151.js
rename : browser/components/sessionstore/test/browser/browser_623779.js => browser/components/sessionstore/test/browser_623779.js
rename : browser/components/sessionstore/test/browser/browser_624727.js => browser/components/sessionstore/test/browser_624727.js
rename : browser/components/sessionstore/test/browser/browser_625016.js => browser/components/sessionstore/test/browser_625016.js
rename : browser/components/sessionstore/test/browser/browser_625257.js => browser/components/sessionstore/test/browser_625257.js
rename : browser/components/sessionstore/test/browser/browser_628270.js => browser/components/sessionstore/test/browser_628270.js
rename : browser/components/sessionstore/test/browser/browser_635418.js => browser/components/sessionstore/test/browser_635418.js
rename : browser/components/sessionstore/test/browser/browser_636279.js => browser/components/sessionstore/test/browser_636279.js
rename : browser/components/sessionstore/test/browser/browser_644409-scratchpads.js => browser/components/sessionstore/test/browser_644409-scratchpads.js
rename : browser/components/sessionstore/test/browser/browser_645428.js => browser/components/sessionstore/test/browser_645428.js
rename : browser/components/sessionstore/test/browser/browser_659591.js => browser/components/sessionstore/test/browser_659591.js
rename : browser/components/sessionstore/test/browser/browser_662812.js => browser/components/sessionstore/test/browser_662812.js
rename : browser/components/sessionstore/test/browser/browser_665702-state_session.js => browser/components/sessionstore/test/browser_665702-state_session.js
rename : browser/components/sessionstore/test/browser/browser_682507.js => browser/components/sessionstore/test/browser_682507.js
rename : browser/components/sessionstore/test/browser/browser_687710.js => browser/components/sessionstore/test/browser_687710.js
rename : browser/components/sessionstore/test/browser/browser_687710_2.js => browser/components/sessionstore/test/browser_687710_2.js
rename : browser/components/sessionstore/test/browser/browser_694378.js => browser/components/sessionstore/test/browser_694378.js
rename : browser/components/sessionstore/test/browser/browser_705597.js => browser/components/sessionstore/test/browser_705597.js
rename : browser/components/sessionstore/test/browser/browser_form_restore_events.js => browser/components/sessionstore/test/browser_form_restore_events.js
rename : browser/components/sessionstore/test/browser/browser_form_restore_events_sample.html => browser/components/sessionstore/test/browser_form_restore_events_sample.html
rename : browser/components/sessionstore/test/browser/head.js => browser/components/sessionstore/test/head.js
---
 browser/components/sessionstore/Makefile.in                   | 4 +---
 .../components/sessionstore/test/{browser => }/Makefile.in    | 4 ++--
 .../sessionstore/test/{browser => }/browser_248970_a.js       | 0
 .../sessionstore/test/{browser => }/browser_248970_b.js       | 2 +-
 .../test/{browser => }/browser_248970_b_sample.html           | 0
 .../sessionstore/test/{browser => }/browser_339445.js         | 2 +-
 .../test/{browser => }/browser_339445_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_345898.js         | 0
 .../sessionstore/test/{browser => }/browser_346337.js         | 0
 .../test/{browser => }/browser_346337_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_350525.js         | 0
 .../sessionstore/test/{browser => }/browser_354894.js         | 0
 .../sessionstore/test/{browser => }/browser_367052.js         | 0
 .../sessionstore/test/{browser => }/browser_393716.js         | 0
 .../sessionstore/test/{browser => }/browser_394759_basic.js   | 0
 .../test/{browser => }/browser_394759_behavior.js             | 0
 .../test/{browser => }/browser_394759_privatebrowsing.js      | 0
 .../sessionstore/test/{browser => }/browser_394759_purge.js   | 0
 .../sessionstore/test/{browser => }/browser_408470.js         | 0
 .../test/{browser => }/browser_408470_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_423132.js         | 2 +-
 .../test/{browser => }/browser_423132_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_447951.js         | 2 +-
 .../test/{browser => }/browser_447951_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_448741.js         | 0
 .../sessionstore/test/{browser => }/browser_454908.js         | 0
 .../test/{browser => }/browser_454908_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_456342.js         | 0
 .../test/{browser => }/browser_456342_sample.xhtml            | 0
 .../sessionstore/test/{browser => }/browser_459906.js         | 2 +-
 .../sessionstore/test/{browser => }/browser_459906_empty.html | 0
 .../test/{browser => }/browser_459906_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_461634.js         | 0
 .../sessionstore/test/{browser => }/browser_461743.js         | 2 +-
 .../test/{browser => }/browser_461743_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_463205.js         | 2 +-
 .../test/{browser => }/browser_463205_helper.html             | 0
 .../test/{browser => }/browser_463205_sample.html             | 2 +-
 .../sessionstore/test/{browser => }/browser_463206.js         | 2 +-
 .../test/{browser => }/browser_463206_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_464199.js         | 0
 .../sessionstore/test/{browser => }/browser_464620_a.html     | 2 +-
 .../sessionstore/test/{browser => }/browser_464620_a.js       | 2 +-
 .../sessionstore/test/{browser => }/browser_464620_b.html     | 2 +-
 .../sessionstore/test/{browser => }/browser_464620_b.js       | 2 +-
 .../sessionstore/test/{browser => }/browser_464620_xd.html    | 0
 .../sessionstore/test/{browser => }/browser_465215.js         | 0
 .../sessionstore/test/{browser => }/browser_465223.js         | 0
 .../sessionstore/test/{browser => }/browser_466937.js         | 2 +-
 .../test/{browser => }/browser_466937_sample.html             | 0
 .../test/{browser => }/browser_467409-backslashplosion.js     | 0
 .../sessionstore/test/{browser => }/browser_477657.js         | 0
 .../sessionstore/test/{browser => }/browser_480148.js         | 0
 .../sessionstore/test/{browser => }/browser_480893.js         | 0
 .../sessionstore/test/{browser => }/browser_483330.js         | 0
 .../sessionstore/test/{browser => }/browser_485482.js         | 0
 .../test/{browser => }/browser_485482_sample.html             | 0
 .../sessionstore/test/{browser => }/browser_485563.js         | 0
 .../sessionstore/test/{browser => }/browser_490040.js         | 0
 .../sessionstore/test/{browser => }/browser_491168.js         | 0
 .../sessionstore/test/{browser => }/browser_491577.js         | 0
 .../sessionstore/test/{browser => }/browser_493467.js         | 0
 .../sessionstore/test/{browser => }/browser_495495.js         | 0
 .../sessionstore/test/{browser => }/browser_500328.js         | 0
 .../sessionstore/test/{browser => }/browser_506482.js         | 0
 .../sessionstore/test/{browser => }/browser_514751.js         | 0
 .../sessionstore/test/{browser => }/browser_522375.js         | 0
 .../sessionstore/test/{browser => }/browser_522545.js         | 0
 .../sessionstore/test/{browser => }/browser_524745.js         | 0
 .../sessionstore/test/{browser => }/browser_526613.js         | 0
 .../sessionstore/test/{browser => }/browser_528776.js         | 0
 .../sessionstore/test/{browser => }/browser_579868.js         | 0
 .../sessionstore/test/{browser => }/browser_579879.js         | 0
 .../sessionstore/test/{browser => }/browser_580512.js         | 0
 .../sessionstore/test/{browser => }/browser_581593.js         | 0
 .../sessionstore/test/{browser => }/browser_581937.js         | 0
 .../test/{browser => }/browser_586068-cascaded_restore.js     | 0
 .../sessionstore/test/{browser => }/browser_586147.js         | 0
 .../sessionstore/test/{browser => }/browser_588426.js         | 0
 .../sessionstore/test/{browser => }/browser_589246.js         | 0
 .../sessionstore/test/{browser => }/browser_590268.js         | 0
 .../sessionstore/test/{browser => }/browser_590563.js         | 0
 .../test/{browser => }/browser_595601-restore_hidden.js       | 0
 .../sessionstore/test/{browser => }/browser_597071.js         | 0
 .../sessionstore/test/{browser => }/browser_597315.js         | 0
 .../sessionstore/test/{browser => }/browser_597315_a.html     | 0
 .../sessionstore/test/{browser => }/browser_597315_b.html     | 0
 .../sessionstore/test/{browser => }/browser_597315_c.html     | 0
 .../sessionstore/test/{browser => }/browser_597315_c1.html    | 0
 .../sessionstore/test/{browser => }/browser_597315_c2.html    | 0
 .../sessionstore/test/{browser => }/browser_597315_index.html | 0
 .../sessionstore/test/{browser => }/browser_599909.js         | 0
 .../sessionstore/test/{browser => }/browser_600545.js         | 0
 .../sessionstore/test/{browser => }/browser_601955.js         | 0
 .../sessionstore/test/{browser => }/browser_607016.js         | 0
 .../test/{browser => }/browser_615394-SSWindowState_events.js | 0
 .../sessionstore/test/{browser => }/browser_618151.js         | 0
 .../sessionstore/test/{browser => }/browser_623779.js         | 0
 .../sessionstore/test/{browser => }/browser_624727.js         | 0
 .../sessionstore/test/{browser => }/browser_625016.js         | 0
 .../sessionstore/test/{browser => }/browser_625257.js         | 0
 .../sessionstore/test/{browser => }/browser_628270.js         | 0
 .../sessionstore/test/{browser => }/browser_635418.js         | 0
 .../sessionstore/test/{browser => }/browser_636279.js         | 0
 .../test/{browser => }/browser_644409-scratchpads.js          | 0
 .../sessionstore/test/{browser => }/browser_645428.js         | 0
 .../sessionstore/test/{browser => }/browser_659591.js         | 0
 .../sessionstore/test/{browser => }/browser_662812.js         | 0
 .../test/{browser => }/browser_665702-state_session.js        | 0
 .../sessionstore/test/{browser => }/browser_682507.js         | 0
 .../sessionstore/test/{browser => }/browser_687710.js         | 0
 .../sessionstore/test/{browser => }/browser_687710_2.js       | 0
 .../sessionstore/test/{browser => }/browser_694378.js         | 0
 .../sessionstore/test/{browser => }/browser_705597.js         | 0
 .../test/{browser => }/browser_form_restore_events.js         | 2 +-
 .../{browser => }/browser_form_restore_events_sample.html     | 0
 browser/components/sessionstore/test/{browser => }/head.js    | 0
 117 files changed, 18 insertions(+), 20 deletions(-)
 rename browser/components/sessionstore/test/{browser => }/Makefile.in (98%)
 rename browser/components/sessionstore/test/{browser => }/browser_248970_a.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_248970_b.js (99%)
 rename browser/components/sessionstore/test/{browser => }/browser_248970_b_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_339445.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_339445_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_345898.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_346337.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_346337_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_350525.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_354894.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_367052.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_393716.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_394759_basic.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_394759_behavior.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_394759_privatebrowsing.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_394759_purge.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_408470.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_408470_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_423132.js (98%)
 rename browser/components/sessionstore/test/{browser => }/browser_423132_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_447951.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_447951_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_448741.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_454908.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_454908_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_456342.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_456342_sample.xhtml (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_459906.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_459906_empty.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_459906_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_461634.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_461743.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_461743_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_463205.js (98%)
 rename browser/components/sessionstore/test/{browser => }/browser_463205_helper.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_463205_sample.html (90%)
 rename browser/components/sessionstore/test/{browser => }/browser_463206.js (98%)
 rename browser/components/sessionstore/test/{browser => }/browser_463206_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_464199.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_464620_a.html (95%)
 rename browser/components/sessionstore/test/{browser => }/browser_464620_a.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_464620_b.html (95%)
 rename browser/components/sessionstore/test/{browser => }/browser_464620_b.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_464620_xd.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_465215.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_465223.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_466937.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_466937_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_467409-backslashplosion.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_477657.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_480148.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_480893.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_483330.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_485482.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_485482_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_485563.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_490040.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_491168.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_491577.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_493467.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_495495.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_500328.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_506482.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_514751.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_522375.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_522545.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_524745.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_526613.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_528776.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_579868.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_579879.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_580512.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_581593.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_581937.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_586068-cascaded_restore.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_586147.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_588426.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_589246.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_590268.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_590563.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_595601-restore_hidden.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597071.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315_a.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315_b.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315_c.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315_c1.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315_c2.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_597315_index.html (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_599909.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_600545.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_601955.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_607016.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_615394-SSWindowState_events.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_618151.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_623779.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_624727.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_625016.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_625257.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_628270.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_635418.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_636279.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_644409-scratchpads.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_645428.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_659591.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_662812.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_665702-state_session.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_682507.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_687710.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_687710_2.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_694378.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_705597.js (100%)
 rename browser/components/sessionstore/test/{browser => }/browser_form_restore_events.js (97%)
 rename browser/components/sessionstore/test/{browser => }/browser_form_restore_events_sample.html (100%)
 rename browser/components/sessionstore/test/{browser => }/head.js (100%)

diff --git a/browser/components/sessionstore/Makefile.in b/browser/components/sessionstore/Makefile.in
index 8d69860a26d4..df7d6b723bea 100644
--- a/browser/components/sessionstore/Makefile.in
+++ b/browser/components/sessionstore/Makefile.in
@@ -50,8 +50,6 @@ XPIDLSRCS = \
 
 DIRS = src
 
-ifdef ENABLE_TESTS
-DIRS += test/browser
-endif
+TEST_DIRS = test
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/sessionstore/test/browser/Makefile.in b/browser/components/sessionstore/test/Makefile.in
similarity index 98%
rename from browser/components/sessionstore/test/browser/Makefile.in
rename to browser/components/sessionstore/test/Makefile.in
index a455692387cf..3ba76628f998 100644
--- a/browser/components/sessionstore/test/browser/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -36,11 +36,11 @@
 #
 # ***** 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
diff --git a/browser/components/sessionstore/test/browser/browser_248970_a.js b/browser/components/sessionstore/test/browser_248970_a.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_248970_a.js
rename to browser/components/sessionstore/test/browser_248970_a.js
diff --git a/browser/components/sessionstore/test/browser/browser_248970_b.js b/browser/components/sessionstore/test/browser_248970_b.js
similarity index 99%
rename from browser/components/sessionstore/test/browser/browser_248970_b.js
rename to browser/components/sessionstore/test/browser_248970_b.js
index 0e9a7a48b1c8..a5f60a13c61b 100644
--- a/browser/components/sessionstore/test/browser/browser_248970_b.js
+++ b/browser/components/sessionstore/test/browser_248970_b.js
@@ -116,7 +116,7 @@ function test() {
   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);
diff --git a/browser/components/sessionstore/test/browser/browser_248970_b_sample.html b/browser/components/sessionstore/test/browser_248970_b_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_248970_b_sample.html
rename to browser/components/sessionstore/test/browser_248970_b_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_339445.js b/browser/components/sessionstore/test/browser_339445.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_339445.js
rename to browser/components/sessionstore/test/browser_339445.js
index cb2b22fd0739..b076c65260d0 100644
--- a/browser/components/sessionstore/test/browser/browser_339445.js
+++ b/browser/components/sessionstore/test/browser_339445.js
@@ -40,7 +40,7 @@ function test() {
   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) {
diff --git a/browser/components/sessionstore/test/browser/browser_339445_sample.html b/browser/components/sessionstore/test/browser_339445_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_339445_sample.html
rename to browser/components/sessionstore/test/browser_339445_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_345898.js b/browser/components/sessionstore/test/browser_345898.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_345898.js
rename to browser/components/sessionstore/test/browser_345898.js
diff --git a/browser/components/sessionstore/test/browser/browser_346337.js b/browser/components/sessionstore/test/browser_346337.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_346337.js
rename to browser/components/sessionstore/test/browser_346337.js
diff --git a/browser/components/sessionstore/test/browser/browser_346337_sample.html b/browser/components/sessionstore/test/browser_346337_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_346337_sample.html
rename to browser/components/sessionstore/test/browser_346337_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_350525.js b/browser/components/sessionstore/test/browser_350525.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_350525.js
rename to browser/components/sessionstore/test/browser_350525.js
diff --git a/browser/components/sessionstore/test/browser/browser_354894.js b/browser/components/sessionstore/test/browser_354894.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_354894.js
rename to browser/components/sessionstore/test/browser_354894.js
diff --git a/browser/components/sessionstore/test/browser/browser_367052.js b/browser/components/sessionstore/test/browser_367052.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_367052.js
rename to browser/components/sessionstore/test/browser_367052.js
diff --git a/browser/components/sessionstore/test/browser/browser_393716.js b/browser/components/sessionstore/test/browser_393716.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_393716.js
rename to browser/components/sessionstore/test/browser_393716.js
diff --git a/browser/components/sessionstore/test/browser/browser_394759_basic.js b/browser/components/sessionstore/test/browser_394759_basic.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_394759_basic.js
rename to browser/components/sessionstore/test/browser_394759_basic.js
diff --git a/browser/components/sessionstore/test/browser/browser_394759_behavior.js b/browser/components/sessionstore/test/browser_394759_behavior.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_394759_behavior.js
rename to browser/components/sessionstore/test/browser_394759_behavior.js
diff --git a/browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js b/browser/components/sessionstore/test/browser_394759_privatebrowsing.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_394759_privatebrowsing.js
rename to browser/components/sessionstore/test/browser_394759_privatebrowsing.js
diff --git a/browser/components/sessionstore/test/browser/browser_394759_purge.js b/browser/components/sessionstore/test/browser_394759_purge.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_394759_purge.js
rename to browser/components/sessionstore/test/browser_394759_purge.js
diff --git a/browser/components/sessionstore/test/browser/browser_408470.js b/browser/components/sessionstore/test/browser_408470.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_408470.js
rename to browser/components/sessionstore/test/browser_408470.js
diff --git a/browser/components/sessionstore/test/browser/browser_408470_sample.html b/browser/components/sessionstore/test/browser_408470_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_408470_sample.html
rename to browser/components/sessionstore/test/browser_408470_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_423132.js b/browser/components/sessionstore/test/browser_423132.js
similarity index 98%
rename from browser/components/sessionstore/test/browser/browser_423132.js
rename to browser/components/sessionstore/test/browser_423132.js
index 158f7d42eca5..e3fd53729ee5 100644
--- a/browser/components/sessionstore/test/browser/browser_423132.js
+++ b/browser/components/sessionstore/test/browser_423132.js
@@ -48,7 +48,7 @@ function test() {
   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");
diff --git a/browser/components/sessionstore/test/browser/browser_423132_sample.html b/browser/components/sessionstore/test/browser_423132_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_423132_sample.html
rename to browser/components/sessionstore/test/browser_423132_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_447951.js b/browser/components/sessionstore/test/browser_447951.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_447951.js
rename to browser/components/sessionstore/test/browser_447951.js
index a5842f9cd6f6..f38693f3332d 100644
--- a/browser/components/sessionstore/test/browser/browser_447951.js
+++ b/browser/components/sessionstore/test/browser_447951.js
@@ -39,7 +39,7 @@ function test() {
   
   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) {
diff --git a/browser/components/sessionstore/test/browser/browser_447951_sample.html b/browser/components/sessionstore/test/browser_447951_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_447951_sample.html
rename to browser/components/sessionstore/test/browser_447951_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_448741.js b/browser/components/sessionstore/test/browser_448741.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_448741.js
rename to browser/components/sessionstore/test/browser_448741.js
diff --git a/browser/components/sessionstore/test/browser/browser_454908.js b/browser/components/sessionstore/test/browser_454908.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_454908.js
rename to browser/components/sessionstore/test/browser_454908.js
diff --git a/browser/components/sessionstore/test/browser/browser_454908_sample.html b/browser/components/sessionstore/test/browser_454908_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_454908_sample.html
rename to browser/components/sessionstore/test/browser_454908_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_456342.js b/browser/components/sessionstore/test/browser_456342.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_456342.js
rename to browser/components/sessionstore/test/browser_456342.js
diff --git a/browser/components/sessionstore/test/browser/browser_456342_sample.xhtml b/browser/components/sessionstore/test/browser_456342_sample.xhtml
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_456342_sample.xhtml
rename to browser/components/sessionstore/test/browser_456342_sample.xhtml
diff --git a/browser/components/sessionstore/test/browser/browser_459906.js b/browser/components/sessionstore/test/browser_459906.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_459906.js
rename to browser/components/sessionstore/test/browser_459906.js
index 2886385a80a6..3e20ede1d734 100644
--- a/browser/components/sessionstore/test/browser/browser_459906.js
+++ b/browser/components/sessionstore/test/browser_459906.js
@@ -40,7 +40,7 @@ function test() {
   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;
diff --git a/browser/components/sessionstore/test/browser/browser_459906_empty.html b/browser/components/sessionstore/test/browser_459906_empty.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_459906_empty.html
rename to browser/components/sessionstore/test/browser_459906_empty.html
diff --git a/browser/components/sessionstore/test/browser/browser_459906_sample.html b/browser/components/sessionstore/test/browser_459906_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_459906_sample.html
rename to browser/components/sessionstore/test/browser_459906_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_461634.js b/browser/components/sessionstore/test/browser_461634.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_461634.js
rename to browser/components/sessionstore/test/browser_461634.js
diff --git a/browser/components/sessionstore/test/browser/browser_461743.js b/browser/components/sessionstore/test/browser_461743.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_461743.js
rename to browser/components/sessionstore/test/browser_461743.js
index 754fa6dee382..f956b428e2fe 100644
--- a/browser/components/sessionstore/test/browser/browser_461743.js
+++ b/browser/components/sessionstore/test/browser_461743.js
@@ -40,7 +40,7 @@ function test() {
   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);
diff --git a/browser/components/sessionstore/test/browser/browser_461743_sample.html b/browser/components/sessionstore/test/browser_461743_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_461743_sample.html
rename to browser/components/sessionstore/test/browser_461743_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_463205.js b/browser/components/sessionstore/test/browser_463205.js
similarity index 98%
rename from browser/components/sessionstore/test/browser/browser_463205.js
rename to browser/components/sessionstore/test/browser_463205.js
index 6214c4062a6f..1eb6adb82ed1 100644
--- a/browser/components/sessionstore/test/browser/browser_463205.js
+++ b/browser/components/sessionstore/test/browser_463205.js
@@ -98,7 +98,7 @@ function test() {
 
     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";
 
diff --git a/browser/components/sessionstore/test/browser/browser_463205_helper.html b/browser/components/sessionstore/test/browser_463205_helper.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_463205_helper.html
rename to browser/components/sessionstore/test/browser_463205_helper.html
diff --git a/browser/components/sessionstore/test/browser/browser_463205_sample.html b/browser/components/sessionstore/test/browser_463205_sample.html
similarity index 90%
rename from browser/components/sessionstore/test/browser/browser_463205_sample.html
rename to browser/components/sessionstore/test/browser_463205_sample.html
index 119d3b05caca..7df6c4cbbc2b 100644
--- a/browser/components/sessionstore/test/browser/browser_463205_sample.html
+++ b/browser/components/sessionstore/test/browser_463205_sample.html
@@ -18,7 +18,7 @@
     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>
diff --git a/browser/components/sessionstore/test/browser/browser_463206.js b/browser/components/sessionstore/test/browser_463206.js
similarity index 98%
rename from browser/components/sessionstore/test/browser/browser_463206.js
rename to browser/components/sessionstore/test/browser_463206.js
index a1df86fb52b5..5040d58512d6 100644
--- a/browser/components/sessionstore/test/browser/browser_463206.js
+++ b/browser/components/sessionstore/test/browser_463206.js
@@ -40,7 +40,7 @@ function test() {
   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);
diff --git a/browser/components/sessionstore/test/browser/browser_463206_sample.html b/browser/components/sessionstore/test/browser_463206_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_463206_sample.html
rename to browser/components/sessionstore/test/browser_463206_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_464199.js b/browser/components/sessionstore/test/browser_464199.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_464199.js
rename to browser/components/sessionstore/test/browser_464199.js
diff --git a/browser/components/sessionstore/test/browser/browser_464620_a.html b/browser/components/sessionstore/test/browser_464620_a.html
similarity index 95%
rename from browser/components/sessionstore/test/browser/browser_464620_a.html
rename to browser/components/sessionstore/test/browser_464620_a.html
index c1871ea76724..3fdaeb809b12 100644
--- a/browser/components/sessionstore/test/browser/browser_464620_a.html
+++ b/browser/components/sessionstore/test/browser_464620_a.html
@@ -7,7 +7,7 @@
 
 <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() {
diff --git a/browser/components/sessionstore/test/browser/browser_464620_a.js b/browser/components/sessionstore/test/browser_464620_a.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_464620_a.js
rename to browser/components/sessionstore/test/browser_464620_a.js
index 609dfeb9280e..b33bd0745dc4 100644
--- a/browser/components/sessionstore/test/browser/browser_464620_a.js
+++ b/browser/components/sessionstore/test/browser_464620_a.js
@@ -40,7 +40,7 @@ function test() {
   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);
diff --git a/browser/components/sessionstore/test/browser/browser_464620_b.html b/browser/components/sessionstore/test/browser_464620_b.html
similarity index 95%
rename from browser/components/sessionstore/test/browser/browser_464620_b.html
rename to browser/components/sessionstore/test/browser_464620_b.html
index 86524b98b431..f8db6c86d96e 100644
--- a/browser/components/sessionstore/test/browser/browser_464620_b.html
+++ b/browser/components/sessionstore/test/browser_464620_b.html
@@ -8,7 +8,7 @@
 
 <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() {
diff --git a/browser/components/sessionstore/test/browser/browser_464620_b.js b/browser/components/sessionstore/test/browser_464620_b.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_464620_b.js
rename to browser/components/sessionstore/test/browser_464620_b.js
index 8080b4a93f09..847555f01022 100644
--- a/browser/components/sessionstore/test/browser/browser_464620_b.js
+++ b/browser/components/sessionstore/test/browser_464620_b.js
@@ -40,7 +40,7 @@ function test() {
   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);
diff --git a/browser/components/sessionstore/test/browser/browser_464620_xd.html b/browser/components/sessionstore/test/browser_464620_xd.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_464620_xd.html
rename to browser/components/sessionstore/test/browser_464620_xd.html
diff --git a/browser/components/sessionstore/test/browser/browser_465215.js b/browser/components/sessionstore/test/browser_465215.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_465215.js
rename to browser/components/sessionstore/test/browser_465215.js
diff --git a/browser/components/sessionstore/test/browser/browser_465223.js b/browser/components/sessionstore/test/browser_465223.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_465223.js
rename to browser/components/sessionstore/test/browser_465223.js
diff --git a/browser/components/sessionstore/test/browser/browser_466937.js b/browser/components/sessionstore/test/browser_466937.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_466937.js
rename to browser/components/sessionstore/test/browser_466937.js
index a74539cd76c1..4ab8e549bfdb 100644
--- a/browser/components/sessionstore/test/browser/browser_466937.js
+++ b/browser/components/sessionstore/test/browser_466937.js
@@ -47,7 +47,7 @@ function test() {
   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) {
diff --git a/browser/components/sessionstore/test/browser/browser_466937_sample.html b/browser/components/sessionstore/test/browser_466937_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_466937_sample.html
rename to browser/components/sessionstore/test/browser_466937_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_467409-backslashplosion.js b/browser/components/sessionstore/test/browser_467409-backslashplosion.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_467409-backslashplosion.js
rename to browser/components/sessionstore/test/browser_467409-backslashplosion.js
diff --git a/browser/components/sessionstore/test/browser/browser_477657.js b/browser/components/sessionstore/test/browser_477657.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_477657.js
rename to browser/components/sessionstore/test/browser_477657.js
diff --git a/browser/components/sessionstore/test/browser/browser_480148.js b/browser/components/sessionstore/test/browser_480148.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_480148.js
rename to browser/components/sessionstore/test/browser_480148.js
diff --git a/browser/components/sessionstore/test/browser/browser_480893.js b/browser/components/sessionstore/test/browser_480893.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_480893.js
rename to browser/components/sessionstore/test/browser_480893.js
diff --git a/browser/components/sessionstore/test/browser/browser_483330.js b/browser/components/sessionstore/test/browser_483330.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_483330.js
rename to browser/components/sessionstore/test/browser_483330.js
diff --git a/browser/components/sessionstore/test/browser/browser_485482.js b/browser/components/sessionstore/test/browser_485482.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_485482.js
rename to browser/components/sessionstore/test/browser_485482.js
diff --git a/browser/components/sessionstore/test/browser/browser_485482_sample.html b/browser/components/sessionstore/test/browser_485482_sample.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_485482_sample.html
rename to browser/components/sessionstore/test/browser_485482_sample.html
diff --git a/browser/components/sessionstore/test/browser/browser_485563.js b/browser/components/sessionstore/test/browser_485563.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_485563.js
rename to browser/components/sessionstore/test/browser_485563.js
diff --git a/browser/components/sessionstore/test/browser/browser_490040.js b/browser/components/sessionstore/test/browser_490040.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_490040.js
rename to browser/components/sessionstore/test/browser_490040.js
diff --git a/browser/components/sessionstore/test/browser/browser_491168.js b/browser/components/sessionstore/test/browser_491168.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_491168.js
rename to browser/components/sessionstore/test/browser_491168.js
diff --git a/browser/components/sessionstore/test/browser/browser_491577.js b/browser/components/sessionstore/test/browser_491577.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_491577.js
rename to browser/components/sessionstore/test/browser_491577.js
diff --git a/browser/components/sessionstore/test/browser/browser_493467.js b/browser/components/sessionstore/test/browser_493467.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_493467.js
rename to browser/components/sessionstore/test/browser_493467.js
diff --git a/browser/components/sessionstore/test/browser/browser_495495.js b/browser/components/sessionstore/test/browser_495495.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_495495.js
rename to browser/components/sessionstore/test/browser_495495.js
diff --git a/browser/components/sessionstore/test/browser/browser_500328.js b/browser/components/sessionstore/test/browser_500328.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_500328.js
rename to browser/components/sessionstore/test/browser_500328.js
diff --git a/browser/components/sessionstore/test/browser/browser_506482.js b/browser/components/sessionstore/test/browser_506482.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_506482.js
rename to browser/components/sessionstore/test/browser_506482.js
diff --git a/browser/components/sessionstore/test/browser/browser_514751.js b/browser/components/sessionstore/test/browser_514751.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_514751.js
rename to browser/components/sessionstore/test/browser_514751.js
diff --git a/browser/components/sessionstore/test/browser/browser_522375.js b/browser/components/sessionstore/test/browser_522375.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_522375.js
rename to browser/components/sessionstore/test/browser_522375.js
diff --git a/browser/components/sessionstore/test/browser/browser_522545.js b/browser/components/sessionstore/test/browser_522545.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_522545.js
rename to browser/components/sessionstore/test/browser_522545.js
diff --git a/browser/components/sessionstore/test/browser/browser_524745.js b/browser/components/sessionstore/test/browser_524745.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_524745.js
rename to browser/components/sessionstore/test/browser_524745.js
diff --git a/browser/components/sessionstore/test/browser/browser_526613.js b/browser/components/sessionstore/test/browser_526613.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_526613.js
rename to browser/components/sessionstore/test/browser_526613.js
diff --git a/browser/components/sessionstore/test/browser/browser_528776.js b/browser/components/sessionstore/test/browser_528776.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_528776.js
rename to browser/components/sessionstore/test/browser_528776.js
diff --git a/browser/components/sessionstore/test/browser/browser_579868.js b/browser/components/sessionstore/test/browser_579868.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_579868.js
rename to browser/components/sessionstore/test/browser_579868.js
diff --git a/browser/components/sessionstore/test/browser/browser_579879.js b/browser/components/sessionstore/test/browser_579879.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_579879.js
rename to browser/components/sessionstore/test/browser_579879.js
diff --git a/browser/components/sessionstore/test/browser/browser_580512.js b/browser/components/sessionstore/test/browser_580512.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_580512.js
rename to browser/components/sessionstore/test/browser_580512.js
diff --git a/browser/components/sessionstore/test/browser/browser_581593.js b/browser/components/sessionstore/test/browser_581593.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_581593.js
rename to browser/components/sessionstore/test/browser_581593.js
diff --git a/browser/components/sessionstore/test/browser/browser_581937.js b/browser/components/sessionstore/test/browser_581937.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_581937.js
rename to browser/components/sessionstore/test/browser_581937.js
diff --git a/browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js b/browser/components/sessionstore/test/browser_586068-cascaded_restore.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_586068-cascaded_restore.js
rename to browser/components/sessionstore/test/browser_586068-cascaded_restore.js
diff --git a/browser/components/sessionstore/test/browser/browser_586147.js b/browser/components/sessionstore/test/browser_586147.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_586147.js
rename to browser/components/sessionstore/test/browser_586147.js
diff --git a/browser/components/sessionstore/test/browser/browser_588426.js b/browser/components/sessionstore/test/browser_588426.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_588426.js
rename to browser/components/sessionstore/test/browser_588426.js
diff --git a/browser/components/sessionstore/test/browser/browser_589246.js b/browser/components/sessionstore/test/browser_589246.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_589246.js
rename to browser/components/sessionstore/test/browser_589246.js
diff --git a/browser/components/sessionstore/test/browser/browser_590268.js b/browser/components/sessionstore/test/browser_590268.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_590268.js
rename to browser/components/sessionstore/test/browser_590268.js
diff --git a/browser/components/sessionstore/test/browser/browser_590563.js b/browser/components/sessionstore/test/browser_590563.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_590563.js
rename to browser/components/sessionstore/test/browser_590563.js
diff --git a/browser/components/sessionstore/test/browser/browser_595601-restore_hidden.js b/browser/components/sessionstore/test/browser_595601-restore_hidden.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_595601-restore_hidden.js
rename to browser/components/sessionstore/test/browser_595601-restore_hidden.js
diff --git a/browser/components/sessionstore/test/browser/browser_597071.js b/browser/components/sessionstore/test/browser_597071.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597071.js
rename to browser/components/sessionstore/test/browser_597071.js
diff --git a/browser/components/sessionstore/test/browser/browser_597315.js b/browser/components/sessionstore/test/browser_597315.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315.js
rename to browser/components/sessionstore/test/browser_597315.js
diff --git a/browser/components/sessionstore/test/browser/browser_597315_a.html b/browser/components/sessionstore/test/browser_597315_a.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315_a.html
rename to browser/components/sessionstore/test/browser_597315_a.html
diff --git a/browser/components/sessionstore/test/browser/browser_597315_b.html b/browser/components/sessionstore/test/browser_597315_b.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315_b.html
rename to browser/components/sessionstore/test/browser_597315_b.html
diff --git a/browser/components/sessionstore/test/browser/browser_597315_c.html b/browser/components/sessionstore/test/browser_597315_c.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315_c.html
rename to browser/components/sessionstore/test/browser_597315_c.html
diff --git a/browser/components/sessionstore/test/browser/browser_597315_c1.html b/browser/components/sessionstore/test/browser_597315_c1.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315_c1.html
rename to browser/components/sessionstore/test/browser_597315_c1.html
diff --git a/browser/components/sessionstore/test/browser/browser_597315_c2.html b/browser/components/sessionstore/test/browser_597315_c2.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315_c2.html
rename to browser/components/sessionstore/test/browser_597315_c2.html
diff --git a/browser/components/sessionstore/test/browser/browser_597315_index.html b/browser/components/sessionstore/test/browser_597315_index.html
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_597315_index.html
rename to browser/components/sessionstore/test/browser_597315_index.html
diff --git a/browser/components/sessionstore/test/browser/browser_599909.js b/browser/components/sessionstore/test/browser_599909.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_599909.js
rename to browser/components/sessionstore/test/browser_599909.js
diff --git a/browser/components/sessionstore/test/browser/browser_600545.js b/browser/components/sessionstore/test/browser_600545.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_600545.js
rename to browser/components/sessionstore/test/browser_600545.js
diff --git a/browser/components/sessionstore/test/browser/browser_601955.js b/browser/components/sessionstore/test/browser_601955.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_601955.js
rename to browser/components/sessionstore/test/browser_601955.js
diff --git a/browser/components/sessionstore/test/browser/browser_607016.js b/browser/components/sessionstore/test/browser_607016.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_607016.js
rename to browser/components/sessionstore/test/browser_607016.js
diff --git a/browser/components/sessionstore/test/browser/browser_615394-SSWindowState_events.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_615394-SSWindowState_events.js
rename to browser/components/sessionstore/test/browser_615394-SSWindowState_events.js
diff --git a/browser/components/sessionstore/test/browser/browser_618151.js b/browser/components/sessionstore/test/browser_618151.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_618151.js
rename to browser/components/sessionstore/test/browser_618151.js
diff --git a/browser/components/sessionstore/test/browser/browser_623779.js b/browser/components/sessionstore/test/browser_623779.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_623779.js
rename to browser/components/sessionstore/test/browser_623779.js
diff --git a/browser/components/sessionstore/test/browser/browser_624727.js b/browser/components/sessionstore/test/browser_624727.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_624727.js
rename to browser/components/sessionstore/test/browser_624727.js
diff --git a/browser/components/sessionstore/test/browser/browser_625016.js b/browser/components/sessionstore/test/browser_625016.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_625016.js
rename to browser/components/sessionstore/test/browser_625016.js
diff --git a/browser/components/sessionstore/test/browser/browser_625257.js b/browser/components/sessionstore/test/browser_625257.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_625257.js
rename to browser/components/sessionstore/test/browser_625257.js
diff --git a/browser/components/sessionstore/test/browser/browser_628270.js b/browser/components/sessionstore/test/browser_628270.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_628270.js
rename to browser/components/sessionstore/test/browser_628270.js
diff --git a/browser/components/sessionstore/test/browser/browser_635418.js b/browser/components/sessionstore/test/browser_635418.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_635418.js
rename to browser/components/sessionstore/test/browser_635418.js
diff --git a/browser/components/sessionstore/test/browser/browser_636279.js b/browser/components/sessionstore/test/browser_636279.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_636279.js
rename to browser/components/sessionstore/test/browser_636279.js
diff --git a/browser/components/sessionstore/test/browser/browser_644409-scratchpads.js b/browser/components/sessionstore/test/browser_644409-scratchpads.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_644409-scratchpads.js
rename to browser/components/sessionstore/test/browser_644409-scratchpads.js
diff --git a/browser/components/sessionstore/test/browser/browser_645428.js b/browser/components/sessionstore/test/browser_645428.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_645428.js
rename to browser/components/sessionstore/test/browser_645428.js
diff --git a/browser/components/sessionstore/test/browser/browser_659591.js b/browser/components/sessionstore/test/browser_659591.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_659591.js
rename to browser/components/sessionstore/test/browser_659591.js
diff --git a/browser/components/sessionstore/test/browser/browser_662812.js b/browser/components/sessionstore/test/browser_662812.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_662812.js
rename to browser/components/sessionstore/test/browser_662812.js
diff --git a/browser/components/sessionstore/test/browser/browser_665702-state_session.js b/browser/components/sessionstore/test/browser_665702-state_session.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_665702-state_session.js
rename to browser/components/sessionstore/test/browser_665702-state_session.js
diff --git a/browser/components/sessionstore/test/browser/browser_682507.js b/browser/components/sessionstore/test/browser_682507.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_682507.js
rename to browser/components/sessionstore/test/browser_682507.js
diff --git a/browser/components/sessionstore/test/browser/browser_687710.js b/browser/components/sessionstore/test/browser_687710.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_687710.js
rename to browser/components/sessionstore/test/browser_687710.js
diff --git a/browser/components/sessionstore/test/browser/browser_687710_2.js b/browser/components/sessionstore/test/browser_687710_2.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_687710_2.js
rename to browser/components/sessionstore/test/browser_687710_2.js
diff --git a/browser/components/sessionstore/test/browser/browser_694378.js b/browser/components/sessionstore/test/browser_694378.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_694378.js
rename to browser/components/sessionstore/test/browser_694378.js
diff --git a/browser/components/sessionstore/test/browser/browser_705597.js b/browser/components/sessionstore/test/browser_705597.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/browser_705597.js
rename to browser/components/sessionstore/test/browser_705597.js
diff --git a/browser/components/sessionstore/test/browser/browser_form_restore_events.js b/browser/components/sessionstore/test/browser_form_restore_events.js
similarity index 97%
rename from browser/components/sessionstore/test/browser/browser_form_restore_events.js
rename to browser/components/sessionstore/test/browser_form_restore_events.js
index 31962ae0020e..bc7aa20beceb 100644
--- a/browser/components/sessionstore/test/browser/browser_form_restore_events.js
+++ b/browser/components/sessionstore/test/browser_form_restore_events.js
@@ -44,7 +44,7 @@ function test() {
              .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);
diff --git a/browser/components/sessionstore/test/browser/browser_form_restore_events_sample.html b/browser/components/sessionstore/test/browser_form_restore_events_sample.html
similarity index 100%
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
diff --git a/browser/components/sessionstore/test/browser/head.js b/browser/components/sessionstore/test/head.js
similarity index 100%
rename from browser/components/sessionstore/test/browser/head.js
rename to browser/components/sessionstore/test/head.js