Bug 828116 - Move modules in toolkit/content and toolkit/mozapps/shared to toolkit/modules. r=Mossop

--HG--
rename : toolkit/mozapps/shared/CertUtils.jsm => toolkit/modules/CertUtils.jsm
rename : toolkit/content/DeferredTask.jsm => toolkit/modules/DeferredTask.jsm
rename : toolkit/content/Deprecated.jsm => toolkit/modules/Deprecated.jsm
rename : toolkit/content/Dict.jsm => toolkit/modules/Dict.jsm
rename : toolkit/mozapps/shared/FileUtils.jsm => toolkit/modules/FileUtils.jsm
rename : toolkit/content/Geometry.jsm => toolkit/modules/Geometry.jsm
rename : toolkit/content/InlineSpellChecker.jsm => toolkit/modules/InlineSpellChecker.jsm
rename : toolkit/content/LightweightThemeConsumer.jsm => toolkit/modules/LightweightThemeConsumer.jsm
rename : toolkit/content/PageMenu.jsm => toolkit/modules/PageMenu.jsm
rename : toolkit/content/PopupNotifications.jsm => toolkit/modules/PopupNotifications.jsm
rename : toolkit/content/PrivateBrowsingUtils.jsm => toolkit/modules/PrivateBrowsingUtils.jsm
rename : toolkit/content/PropertyListUtils.jsm => toolkit/modules/PropertyListUtils.jsm
rename : toolkit/content/Services.jsm => toolkit/modules/Services.jsm
rename : toolkit/content/Task.jsm => toolkit/modules/Task.jsm
rename : toolkit/content/Troubleshoot.jsm => toolkit/modules/Troubleshoot.jsm
rename : toolkit/content/UpdateChannel.jsm => toolkit/modules/UpdateChannel.jsm
rename : toolkit/content/WindowDraggingUtils.jsm => toolkit/modules/WindowDraggingUtils.jsm
rename : toolkit/content/debug.js => toolkit/modules/debug.js
rename : toolkit/content/tests/browser/browser_DeferredTask.js => toolkit/modules/tests/browser/browser_DeferredTask.js
rename : toolkit/content/tests/browser/browser_Deprecated.js => toolkit/modules/tests/browser/browser_Deprecated.js
rename : toolkit/content/tests/browser/browser_Geometry.js => toolkit/modules/tests/browser/browser_Geometry.js
rename : toolkit/content/tests/browser/browser_InlineSpellChecker.js => toolkit/modules/tests/browser/browser_InlineSpellChecker.js
rename : toolkit/content/tests/browser/browser_Services.js => toolkit/modules/tests/browser/browser_Services.js
rename : toolkit/content/tests/browser/browser_Troubleshoot.js => toolkit/modules/tests/browser/browser_Troubleshoot.js
rename : toolkit/mozapps/shared/test/chrome/Makefile.in => toolkit/modules/tests/chrome/Makefile.in
rename : toolkit/mozapps/shared/test/chrome/moz.build => toolkit/modules/tests/chrome/moz.build
rename : toolkit/mozapps/shared/test/chrome/test_bug544442_checkCert.xul => toolkit/modules/tests/chrome/test_bug544442_checkCert.xul
rename : toolkit/content/tests/unit/propertyLists/bug710259_propertyListBinary.plist => toolkit/modules/tests/xpcshell/propertyLists/bug710259_propertyListBinary.plist
rename : toolkit/content/tests/unit/propertyLists/bug710259_propertyListXML.plist => toolkit/modules/tests/xpcshell/propertyLists/bug710259_propertyListXML.plist
rename : toolkit/mozapps/shared/test/unit/test_FileUtils.js => toolkit/modules/tests/xpcshell/test_FileUtils.js
rename : toolkit/content/tests/unit/test_dict.js => toolkit/modules/tests/xpcshell/test_dict.js
rename : toolkit/content/tests/unit/test_propertyListsUtils.js => toolkit/modules/tests/xpcshell/test_propertyListsUtils.js
rename : toolkit/mozapps/shared/test/unit/test_readCertPrefs.js => toolkit/modules/tests/xpcshell/test_readCertPrefs.js
rename : toolkit/content/tests/unit/test_task.js => toolkit/modules/tests/xpcshell/test_task.js

toolkit/components/search/nsSearchService.js

@@ -4198,4 +4198,4 @@ var engineUpdateService = {
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SearchService]);
 
-#include ../../../toolkit/content/debug.js
+#include ../../../toolkit/modules/debug.js

toolkit/content/Makefile.in

@@ -46,33 +46,4 @@ endif
 BUILD_HOSTNAME = $(shell hostname -s || hostname)
 DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"
 
-ifdef MOZ_TOOLKIT_SEARCH
-DEFINES += -DMOZ_TOOLKIT_SEARCH
-endif
-
-EXTRA_JS_MODULES = \
-  debug.js \
-  DeferredTask.jsm \
-  Deprecated.jsm \
-  Dict.jsm \
-  Geometry.jsm \
-  InlineSpellChecker.jsm \
-  PageMenu.jsm \
-  PopupNotifications.jsm \
-  PropertyListUtils.jsm \
-  Task.jsm \
-  PrivateBrowsingUtils.jsm \
-  $(NULL)
-
-EXTRA_PP_JS_MODULES = \
-  Services.jsm \
-  WindowDraggingUtils.jsm \
-  Troubleshoot.jsm \
-  UpdateChannel.jsm \
-  $(NULL)
-
-ifneq (Android,$(OS_TARGET))
-EXTRA_PP_JS_MODULES += LightweightThemeConsumer.jsm
-endif
-
 include $(topsrcdir)/config/rules.mk

toolkit/content/tests/browser/Makefile.in

@@ -15,15 +15,9 @@ MOCHITEST_BROWSER_FILES = \
   browser_keyevents_during_autoscrolling.js \
   browser_bug295977_autoscroll_overflow.js \
   browser_bug594509.js \
-  browser_Geometry.js \
-  browser_InlineSpellChecker.js \
   browser_save_resend_postdata.js \
   browser_browserDrop.js \
-  browser_Services.js \
-  browser_DeferredTask.js \
   browser_default_image_filename.js \
-  browser_Troubleshoot.js \
-  browser_Deprecated.js \
   browser_input_file_tooltips.js \
   $(NULL)
 

toolkit/content/tests/unit/xpcshell.ini

@@ -3,6 +3,3 @@ head =
 tail = 
 
 [test_contentAreaUtils.js]
-[test_dict.js]
-[test_propertyListsUtils.js]
-[test_task.js]

toolkit/modules/Makefile.in

@@ -9,13 +9,41 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_TOOLKIT_SEARCH
+DEFINES += -DMOZ_TOOLKIT_SEARCH
+endif
+
 EXTRA_JS_MODULES := \
+  debug.js \
+  DeferredTask.jsm \
+  Deprecated.jsm \
+  Dict.jsm \
+  FileUtils.jsm \
+  Geometry.jsm \
+  InlineSpellChecker.jsm \
   NewTabUtils.jsm \
+  PageMenu.jsm \
+  PopupNotifications.jsm \
   Preferences.jsm \
+  PrivateBrowsingUtils.jsm \
+  PropertyListUtils.jsm \
   RemoteWebProgress.jsm \
   Sqlite.jsm \
+  Task.jsm \
   TelemetryTimestamps.jsm \
   Timer.jsm \
   $(NULL)
 
+EXTRA_PP_JS_MODULES = \
+  CertUtils.jsm \
+  Services.jsm \
+  Troubleshoot.jsm \
+  UpdateChannel.jsm \
+  WindowDraggingUtils.jsm \
+  $(NULL)
+
+ifneq (Android,$(OS_TARGET))
+EXTRA_PP_JS_MODULES += LightweightThemeConsumer.jsm
+endif
+
 include $(topsrcdir)/config/rules.mk

toolkit/modules/tests/browser/Makefile.in

@@ -1,21 +1,24 @@
+#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
+DEPTH          = @DEPTH@
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_JS_MODULES = \
-  CertUtils.jsm \
-  $(NULL)
-
-EXTRA_JS_MODULES = \
-  FileUtils.jsm \
+MOCHITEST_BROWSER_FILES = \
+  browser_DeferredTask.js \
+  browser_Deprecated.js \
+  browser_Geometry.js \
+  browser_InlineSpellChecker.js \
+  browser_Services.js \
+  browser_Troubleshoot.js \
+  
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/modules/tests/chrome/moz.build

@@ -4,9 +4,3 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-TEST_DIRS += ['test/chrome']
-
-MODULE = 'toolkitShared'
-
-if CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

toolkit/modules/tests/moz.build

@@ -4,4 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DIRS += ['browser']
+
+MODULE = 'test_toolkit_general'
+
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']

toolkit/modules/tests/xpcshell/xpcshell.ini

@@ -2,8 +2,13 @@
 head =
 tail =
 
+[test_dict.js]
+[test_FileUtils.js]
 [test_newtab-migrate-v1.js]
 [test_Preferences.js]
+[test_propertyListsUtils.js]
+[test_readCertPrefs.js]
 [test_sqlite.js]
+[test_task.js]
 [test_TelemetryTimestamps.js]
 [test_timer.js]

toolkit/moz.build

@@ -17,7 +17,6 @@ PARALLEL_DIRS += [
     'mozapps/handling',
     'mozapps/preferences',
     'mozapps/plugins',
-    'mozapps/shared',
     'obsolete',
     'profile',
     'themes',

toolkit/mozapps/shared/test/unit/xpcshell.ini

@@ -1,7 +0,0 @@
-[DEFAULT]
-head = 
-tail = 
-
-[test_FileUtils.js]
-
-[test_readCertPrefs.js]