Bug 692625 - Move toolkit/components/startup/tests/browser/ to toolkit/components/startup/tests/; r=dtownsend

--HG--
rename : toolkit/components/startup/tests/browser/Makefile.in => toolkit/components/startup/tests/Makefile.in
rename : toolkit/components/startup/tests/browser/beforeunload.html => toolkit/components/startup/tests/beforeunload.html
rename : toolkit/components/startup/tests/browser/browser_bug511456.js => toolkit/components/startup/tests/browser_bug511456.js
rename : toolkit/components/startup/tests/browser/browser_bug537449.js => toolkit/components/startup/tests/browser_bug537449.js

toolkit/components/startup/Makefile.in

@@ -70,10 +70,8 @@ endif
 endif
 endif
 
-ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
-DIRS += tests/browser
-endif
+TEST_DIRS = tests
 endif
 
 include $(topsrcdir)/config/rules.mk

toolkit/components/startup/tests/Makefile.in

@@ -35,11 +35,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/startup/tests/browser
+relativesrcdir  = toolkit/components/startup/tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

toolkit/components/startup/tests/browser_bug511456.js

@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 const PROMPT_URL = "chrome://global/content/commonDialog.xul";
-const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
+const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
 
 var Watcher = {
   seen: false,

toolkit/components/startup/tests/browser_bug537449.js

@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 const PROMPT_URL = "chrome://global/content/commonDialog.xul";
-const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
+const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
 
 var Watcher = {
   seen: false,