Bug 692625 - Move browser/components/test/browser/ to browser/components/test/; r=gavin

--HG--
rename : browser/components/test/browser/Makefile.in => browser/components/test/Makefile.in
rename : browser/components/test/browser/browser_bug538331.js => browser/components/test/browser_bug538331.js

browser/components/Makefile.in

@@ -78,9 +78,7 @@ ifdef MOZ_SAFE_BROWSING
 PARALLEL_DIRS += safebrowsing
 endif
 
-ifdef ENABLE_TESTS
-DIRS += test/browser
-endif
+TEST_DIRS += test
 
 DIRS += build
 

browser/components/test/Makefile.in

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