Issue %3005 - Prep: Move toolkit/{mozapps -> components}/extensions

79 files changed, 78 insertions, 95 deletions

diff --git a/toolkit/mozapps/extensions/content/OpenH264-license.txt b/toolkit/components/extensions/content/OpenH264-license.txt
index ad37989b8..ad37989b8 100644
--- a/toolkit/mozapps/extensions/content/OpenH264-license.txt
+++ b/toolkit/components/extensions/content/OpenH264-license.txt
diff --git a/toolkit/mozapps/extensions/content/about.js b/toolkit/components/extensions/content/about.js
index 49ca4acc1..49ca4acc1 100644
--- a/toolkit/mozapps/extensions/content/about.js
+++ b/toolkit/components/extensions/content/about.js
diff --git a/toolkit/mozapps/extensions/content/about.xul b/toolkit/components/extensions/content/about.xul
index 6effcf37a..6effcf37a 100644
--- a/toolkit/mozapps/extensions/content/about.xul
+++ b/toolkit/components/extensions/content/about.xul
diff --git a/toolkit/mozapps/extensions/content/blocklist.css b/toolkit/components/extensions/content/blocklist.css
index cb48005a2..cb48005a2 100644
--- a/toolkit/mozapps/extensions/content/blocklist.css
+++ b/toolkit/components/extensions/content/blocklist.css
diff --git a/toolkit/mozapps/extensions/content/blocklist.js b/toolkit/components/extensions/content/blocklist.js
index 6d524e6ee..6d524e6ee 100644
--- a/toolkit/mozapps/extensions/content/blocklist.js
+++ b/toolkit/components/extensions/content/blocklist.js
diff --git a/toolkit/mozapps/extensions/content/blocklist.xml b/toolkit/components/extensions/content/blocklist.xml
index 74474392f..74474392f 100644
--- a/toolkit/mozapps/extensions/content/blocklist.xml
+++ b/toolkit/components/extensions/content/blocklist.xml
diff --git a/toolkit/mozapps/extensions/content/blocklist.xul b/toolkit/components/extensions/content/blocklist.xul
index 240d9e4e1..240d9e4e1 100644
--- a/toolkit/mozapps/extensions/content/blocklist.xul
+++ b/toolkit/components/extensions/content/blocklist.xul
diff --git a/toolkit/mozapps/extensions/content/eula.js b/toolkit/components/extensions/content/eula.js
index a05f7fe1c..a05f7fe1c 100644
--- a/toolkit/mozapps/extensions/content/eula.js
+++ b/toolkit/components/extensions/content/eula.js
diff --git a/toolkit/mozapps/extensions/content/eula.xul b/toolkit/components/extensions/content/eula.xul
index 10e657951..10e657951 100644
--- a/toolkit/mozapps/extensions/content/eula.xul
+++ b/toolkit/components/extensions/content/eula.xul
diff --git a/toolkit/mozapps/extensions/content/extensions.css b/toolkit/components/extensions/content/extensions.css
index 51828d544..51828d544 100644
--- a/toolkit/mozapps/extensions/content/extensions.css
+++ b/toolkit/components/extensions/content/extensions.css
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/components/extensions/content/extensions.js
index fe84bc460..fe84bc460 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/components/extensions/content/extensions.js
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/components/extensions/content/extensions.xml
index a3246e220..a3246e220 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/components/extensions/content/extensions.xml
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/components/extensions/content/extensions.xul
index 70ce55fa2..70ce55fa2 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/components/extensions/content/extensions.xul
diff --git a/toolkit/mozapps/extensions/content/gmpPrefs.xul b/toolkit/components/extensions/content/gmpPrefs.xul
index ea7ee92fa..ea7ee92fa 100644
--- a/toolkit/mozapps/extensions/content/gmpPrefs.xul
+++ b/toolkit/components/extensions/content/gmpPrefs.xul
diff --git a/toolkit/mozapps/extensions/content/list.js b/toolkit/components/extensions/content/list.js
index a31922703..a31922703 100644
--- a/toolkit/mozapps/extensions/content/list.js
+++ b/toolkit/components/extensions/content/list.js
diff --git a/toolkit/mozapps/extensions/content/list.xul b/toolkit/components/extensions/content/list.xul
index 65efeb6a2..65efeb6a2 100644
--- a/toolkit/mozapps/extensions/content/list.xul
+++ b/toolkit/components/extensions/content/list.xul
diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/components/extensions/content/newaddon.js
index aab556a62..aab556a62 100644
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/components/extensions/content/newaddon.js
diff --git a/toolkit/mozapps/extensions/content/newaddon.xul b/toolkit/components/extensions/content/newaddon.xul
index 0806f2799..0806f2799 100644
--- a/toolkit/mozapps/extensions/content/newaddon.xul
+++ b/toolkit/components/extensions/content/newaddon.xul
diff --git a/toolkit/mozapps/extensions/content/pluginPrefs.xul b/toolkit/components/extensions/content/pluginPrefs.xul
index c3fdbfa5b..c3fdbfa5b 100644
--- a/toolkit/mozapps/extensions/content/pluginPrefs.xul
+++ b/toolkit/components/extensions/content/pluginPrefs.xul
diff --git a/toolkit/mozapps/extensions/content/selectAddons.css b/toolkit/components/extensions/content/selectAddons.css
index 636757721..636757721 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.css
+++ b/toolkit/components/extensions/content/selectAddons.css
diff --git a/toolkit/mozapps/extensions/content/selectAddons.js b/toolkit/components/extensions/content/selectAddons.js
index 01b9030ee..01b9030ee 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.js
+++ b/toolkit/components/extensions/content/selectAddons.js
diff --git a/toolkit/mozapps/extensions/content/selectAddons.xml b/toolkit/components/extensions/content/selectAddons.xml
index dbfc0d400..dbfc0d400 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.xml
+++ b/toolkit/components/extensions/content/selectAddons.xml
diff --git a/toolkit/mozapps/extensions/content/selectAddons.xul b/toolkit/components/extensions/content/selectAddons.xul
index 0fa292ecf..0fa292ecf 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.xul
+++ b/toolkit/components/extensions/content/selectAddons.xul
diff --git a/toolkit/mozapps/extensions/content/setting.xml b/toolkit/components/extensions/content/setting.xml
index c4eae1fd3..c4eae1fd3 100644
--- a/toolkit/mozapps/extensions/content/setting.xml
+++ b/toolkit/components/extensions/content/setting.xml
diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/components/extensions/content/update.js
index 98495b426..98495b426 100644
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/components/extensions/content/update.js
diff --git a/toolkit/mozapps/extensions/content/update.xul b/toolkit/components/extensions/content/update.xul
index 9f5f35196..9f5f35196 100644
--- a/toolkit/mozapps/extensions/content/update.xul
+++ b/toolkit/components/extensions/content/update.xul
diff --git a/toolkit/mozapps/extensions/content/updateinfo.xsl b/toolkit/components/extensions/content/updateinfo.xsl
index 5fcccd6d7..5fcccd6d7 100644
--- a/toolkit/mozapps/extensions/content/updateinfo.xsl
+++ b/toolkit/components/extensions/content/updateinfo.xsl
diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.css b/toolkit/components/extensions/content/xpinstallConfirm.css
index 583facfec..583facfec 100644
--- a/toolkit/mozapps/extensions/content/xpinstallConfirm.css
+++ b/toolkit/components/extensions/content/xpinstallConfirm.css
diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.js b/toolkit/components/extensions/content/xpinstallConfirm.js
index 29be5f5e9..29be5f5e9 100644
--- a/toolkit/mozapps/extensions/content/xpinstallConfirm.js
+++ b/toolkit/components/extensions/content/xpinstallConfirm.js
diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.xul b/toolkit/components/extensions/content/xpinstallConfirm.xul
index f1c29eb73..f1c29eb73 100644
--- a/toolkit/mozapps/extensions/content/xpinstallConfirm.xul
+++ b/toolkit/components/extensions/content/xpinstallConfirm.xul
diff --git a/toolkit/mozapps/extensions/content/xpinstallItem.xml b/toolkit/components/extensions/content/xpinstallItem.xml
index 5146af84f..5146af84f 100644
--- a/toolkit/mozapps/extensions/content/xpinstallItem.xml
+++ b/toolkit/components/extensions/content/xpinstallItem.xml
diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/components/extensions/extensions.manifest
index b56152e10..b56152e10 100644
--- a/toolkit/mozapps/extensions/extensions.manifest
+++ b/toolkit/components/extensions/extensions.manifest
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/components/extensions/jar.mn
index 878be4df1..878be4df1 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/components/extensions/jar.mn
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd b/toolkit/components/extensions/locale/about.dtd
index 4f9098966..4f9098966 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd
+++ b/toolkit/components/extensions/locale/about.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd b/toolkit/components/extensions/locale/blocklist.dtd
index a9490db5e..a9490db5e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
+++ b/toolkit/components/extensions/locale/blocklist.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/components/extensions/locale/extensions.dtd
index 098896d99..098896d99 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/components/extensions/locale/extensions.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/components/extensions/locale/extensions.properties
index 370198f56..370198f56 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/components/extensions/locale/extensions.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd b/toolkit/components/extensions/locale/newaddon.dtd
index 1307cebb9..1307cebb9 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd
+++ b/toolkit/components/extensions/locale/newaddon.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties b/toolkit/components/extensions/locale/newaddon.properties
index bd5997a26..bd5997a26 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties
+++ b/toolkit/components/extensions/locale/newaddon.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/selectAddons.dtd b/toolkit/components/extensions/locale/selectAddons.dtd
index 2f6f1cd57..2f6f1cd57 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/selectAddons.dtd
+++ b/toolkit/components/extensions/locale/selectAddons.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/selectAddons.properties b/toolkit/components/extensions/locale/selectAddons.properties
index 2824758d6..2824758d6 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/selectAddons.properties
+++ b/toolkit/components/extensions/locale/selectAddons.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd b/toolkit/components/extensions/locale/update.dtd
index 6c820e088..6c820e088 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/components/extensions/locale/update.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties b/toolkit/components/extensions/locale/update.properties
index 7cf79f9c1..7cf79f9c1 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties
+++ b/toolkit/components/extensions/locale/update.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd b/toolkit/components/extensions/locale/xpinstallConfirm.dtd
index 6a7d17a16..6a7d17a16 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd
+++ b/toolkit/components/extensions/locale/xpinstallConfirm.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties b/toolkit/components/extensions/locale/xpinstallConfirm.properties
index b538e9e90..b538e9e90 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties
+++ b/toolkit/components/extensions/locale/xpinstallConfirm.properties
diff --git a/toolkit/components/extensions/moz.build b/toolkit/components/extensions/moz.build
new file mode 100644
index 000000000..9bcb5bf45
--- /dev/null
+++ b/toolkit/components/extensions/moz.build
@@ -0,0 +1,65 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+# This is used in multiple places, so is defined here to avoid it getting
+# out of sync.
+DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 16
+
+# Additional debugging info is exposed in debug builds
+if CONFIG['MOZ_EM_DEBUG']:
+    DEFINES['MOZ_EM_DEBUG'] = 1
+
+XPIDL_SOURCES += [
+    'public/amIAddonManager.idl',
+    'public/amIAddonPathService.idl',
+    'public/amIWebInstaller.idl',
+    'public/amIWebInstallListener.idl',
+]
+
+EXPORTS.mozilla += ['src/AddonPathService.h']
+
+SOURCES += ['src/AddonPathService.cpp']
+
+EXTRA_COMPONENTS += [
+    'extensions.manifest',
+    'src/addonManager.js',
+    'src/amContentHandler.js',
+    'src/amInstallTrigger.js',
+    'src/amWebInstallListener.js',
+]
+
+EXTRA_JS_MODULES += [
+    'src/ChromeManifestParser.jsm',
+    'src/DeferredSave.jsm',
+    'src/LightweightThemeManager.jsm',
+]
+
+EXTRA_PP_JS_MODULES += [
+    'src/AddonManager.jsm',
+    'src/GMPInstallManager.jsm',
+    'src/GMPUtils.jsm',
+]
+
+EXTRA_JS_MODULES.addons += [
+    'src/AddonLogging.jsm',
+    'src/AddonRepository.jsm',
+    'src/AddonRepository_SQLiteMigrator.jsm',
+    'src/Content.js',
+    'src/GMPProvider.jsm',
+    'src/LightweightThemeImageOptimizer.jsm',
+    'src/PluginProvider.jsm',
+    'src/ProductAddonChecker.jsm',
+    'src/SpellCheckDictionaryBootstrap.js',
+]
+
+EXTRA_PP_JS_MODULES.addons += [
+    'src/AddonUpdateChecker.jsm',
+    'src/XPIProvider.jsm',
+    'src/XPIProviderUtils.js',
+]
+
+XPIDL_MODULE = 'extensions'
+FINAL_LIBRARY = 'xul'
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/toolkit/mozapps/extensions/amIAddonManager.idl b/toolkit/components/extensions/public/amIAddonManager.idl
index 58a58b62d..58a58b62d 100644
--- a/toolkit/mozapps/extensions/amIAddonManager.idl
+++ b/toolkit/components/extensions/public/amIAddonManager.idl
diff --git a/toolkit/mozapps/extensions/amIAddonPathService.idl b/toolkit/components/extensions/public/amIAddonPathService.idl
index 9c9197a61..9c9197a61 100644
--- a/toolkit/mozapps/extensions/amIAddonPathService.idl
+++ b/toolkit/components/extensions/public/amIAddonPathService.idl
diff --git a/toolkit/mozapps/extensions/amIWebInstallListener.idl b/toolkit/components/extensions/public/amIWebInstallListener.idl
index eed108097..eed108097 100644
--- a/toolkit/mozapps/extensions/amIWebInstallListener.idl
+++ b/toolkit/components/extensions/public/amIWebInstallListener.idl
diff --git a/toolkit/mozapps/extensions/amIWebInstaller.idl b/toolkit/components/extensions/public/amIWebInstaller.idl
index 6c5ebca67..6c5ebca67 100644
--- a/toolkit/mozapps/extensions/amIWebInstaller.idl
+++ b/toolkit/components/extensions/public/amIWebInstaller.idl
diff --git a/toolkit/mozapps/extensions/internal/AddonLogging.jsm b/toolkit/components/extensions/src/AddonLogging.jsm
index ffa92c791..ffa92c791 100644
--- a/toolkit/mozapps/extensions/internal/AddonLogging.jsm
+++ b/toolkit/components/extensions/src/AddonLogging.jsm
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/components/extensions/src/AddonManager.jsm
index aef5c6acb..aef5c6acb 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/components/extensions/src/AddonManager.jsm
diff --git a/toolkit/mozapps/extensions/AddonPathService.cpp b/toolkit/components/extensions/src/AddonPathService.cpp
index ddfdbe817..ddfdbe817 100644
--- a/toolkit/mozapps/extensions/AddonPathService.cpp
+++ b/toolkit/components/extensions/src/AddonPathService.cpp
diff --git a/toolkit/mozapps/extensions/AddonPathService.h b/toolkit/components/extensions/src/AddonPathService.h
index f739b018f..f739b018f 100644
--- a/toolkit/mozapps/extensions/AddonPathService.h
+++ b/toolkit/components/extensions/src/AddonPathService.h
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/components/extensions/src/AddonRepository.jsm
index 41fb5c06d..41fb5c06d 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/components/extensions/src/AddonRepository.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm b/toolkit/components/extensions/src/AddonRepository_SQLiteMigrator.jsm
index 66147b9aa..66147b9aa 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
+++ b/toolkit/components/extensions/src/AddonRepository_SQLiteMigrator.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/components/extensions/src/AddonUpdateChecker.jsm
index 4fce84095..4fce84095 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/components/extensions/src/AddonUpdateChecker.jsm
diff --git a/toolkit/mozapps/extensions/ChromeManifestParser.jsm b/toolkit/components/extensions/src/ChromeManifestParser.jsm
index 63f1db785..63f1db785 100644
--- a/toolkit/mozapps/extensions/ChromeManifestParser.jsm
+++ b/toolkit/components/extensions/src/ChromeManifestParser.jsm
diff --git a/toolkit/mozapps/extensions/internal/Content.js b/toolkit/components/extensions/src/Content.js
index 9f366ba32..9f366ba32 100644
--- a/toolkit/mozapps/extensions/internal/Content.js
+++ b/toolkit/components/extensions/src/Content.js
diff --git a/toolkit/mozapps/extensions/DeferredSave.jsm b/toolkit/components/extensions/src/DeferredSave.jsm
index f1537fe4b..f1537fe4b 100644
--- a/toolkit/mozapps/extensions/DeferredSave.jsm
+++ b/toolkit/components/extensions/src/DeferredSave.jsm
diff --git a/toolkit/mozapps/extensions/GMPInstallManager.jsm b/toolkit/components/extensions/src/GMPInstallManager.jsm
index fe4e2de10..fe4e2de10 100644
--- a/toolkit/mozapps/extensions/GMPInstallManager.jsm
+++ b/toolkit/components/extensions/src/GMPInstallManager.jsm
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/components/extensions/src/GMPProvider.jsm
index c89427101..c89427101 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/components/extensions/src/GMPProvider.jsm
diff --git a/toolkit/mozapps/extensions/GMPUtils.jsm b/toolkit/components/extensions/src/GMPUtils.jsm
index 593fc3c8d..593fc3c8d 100644
--- a/toolkit/mozapps/extensions/GMPUtils.jsm
+++ b/toolkit/components/extensions/src/GMPUtils.jsm
diff --git a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm b/toolkit/components/extensions/src/LightweightThemeImageOptimizer.jsm
index a9201c3da..a9201c3da 100644
--- a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
+++ b/toolkit/components/extensions/src/LightweightThemeImageOptimizer.jsm
diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/components/extensions/src/LightweightThemeManager.jsm
index a4cbf3833..a4cbf3833 100644
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/components/extensions/src/LightweightThemeManager.jsm
diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/components/extensions/src/PluginProvider.jsm
index cb07dcb12..cb07dcb12 100644
--- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm
+++ b/toolkit/components/extensions/src/PluginProvider.jsm
diff --git a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm b/toolkit/components/extensions/src/ProductAddonChecker.jsm
index c6324da0a..c6324da0a 100644
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/components/extensions/src/ProductAddonChecker.jsm
diff --git a/toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js b/toolkit/components/extensions/src/SpellCheckDictionaryBootstrap.js
index f4f557fc2..f4f557fc2 100644
--- a/toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js
+++ b/toolkit/components/extensions/src/SpellCheckDictionaryBootstrap.js
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/components/extensions/src/XPIProvider.jsm
index 01f2abc69..01f2abc69 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/components/extensions/src/XPIProvider.jsm
diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/components/extensions/src/XPIProviderUtils.js
index 9f3273b1a..9f3273b1a 100644
--- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
+++ b/toolkit/components/extensions/src/XPIProviderUtils.js
diff --git a/toolkit/mozapps/extensions/addonManager.js b/toolkit/components/extensions/src/addonManager.js
index 2628ea87b..2628ea87b 100644
--- a/toolkit/mozapps/extensions/addonManager.js
+++ b/toolkit/components/extensions/src/addonManager.js
diff --git a/toolkit/mozapps/extensions/amContentHandler.js b/toolkit/components/extensions/src/amContentHandler.js
index 8dc4dfecd..8dc4dfecd 100644
--- a/toolkit/mozapps/extensions/amContentHandler.js
+++ b/toolkit/components/extensions/src/amContentHandler.js
diff --git a/toolkit/mozapps/extensions/amInstallTrigger.js b/toolkit/components/extensions/src/amInstallTrigger.js
index 5fc0e1717..5fc0e1717 100644
--- a/toolkit/mozapps/extensions/amInstallTrigger.js
+++ b/toolkit/components/extensions/src/amInstallTrigger.js
diff --git a/toolkit/mozapps/extensions/amWebInstallListener.js b/toolkit/components/extensions/src/amWebInstallListener.js
index 9b9c53f44..9b9c53f44 100644
--- a/toolkit/mozapps/extensions/amWebInstallListener.js
+++ b/toolkit/components/extensions/src/amWebInstallListener.js
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index b767af841..a435eee50 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -23,6 +23,7 @@ DIRS += [
     'cookie',
     'crashmonitor',
     'downloads',
+    'extensions',
     'exthelper',
     'filewatcher',
     'finalizationwitness',
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index adb72004d..83092675d 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -101,16 +101,16 @@
   locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (../components/downloads/locale/settingsChange.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (../components/downloads/locale/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (../components/downloads/locale/downloads.properties)
-  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
-  locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
-  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/extensions/blocklist.dtd)
-  locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/extensions/about.dtd)
-  locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (%chrome/mozapps/extensions/selectAddons.dtd)
-  locale/@AB_CD@/mozapps/extensions/selectAddons.properties       (%chrome/mozapps/extensions/selectAddons.properties)
-  locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/extensions/update.dtd)
-  locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/extensions/update.properties)
-  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/extensions/newaddon.dtd)
-  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (%chrome/mozapps/extensions/newaddon.properties)
+  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (../components/extensions/locale/extensions.dtd)
+  locale/@AB_CD@/mozapps/extensions/extensions.properties         (../components/extensions/locale/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (../components/extensions/locale/blocklist.dtd)
+  locale/@AB_CD@/mozapps/extensions/about.dtd                     (../components/extensions/locale/about.dtd)
+  locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (../components/extensions/locale/selectAddons.dtd)
+  locale/@AB_CD@/mozapps/extensions/selectAddons.properties       (../components/extensions/locale/selectAddons.properties)
+  locale/@AB_CD@/mozapps/extensions/update.dtd                    (../components/extensions/locale/update.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.properties             (../components/extensions/locale/update.properties)
+  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (../components/extensions/locale/newaddon.dtd)
+  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (../components/extensions/locale/newaddon.properties)
   locale/@AB_CD@/mozapps/handling/handling.dtd                    (%chrome/mozapps/handling/handling.dtd)
   locale/@AB_CD@/mozapps/handling/handling.properties             (%chrome/mozapps/handling/handling.properties)
   locale/@AB_CD@/mozapps/preferences/changemp.dtd                 (%chrome/mozapps/preferences/changemp.dtd)
@@ -122,8 +122,8 @@
   locale/@AB_CD@/mozapps/update/updates.dtd                       (%chrome/mozapps/update/updates.dtd)
   locale/@AB_CD@/mozapps/update/updates.properties                (%chrome/mozapps/update/updates.properties)
   locale/@AB_CD@/mozapps/update/history.dtd                       (%chrome/mozapps/update/history.dtd)
-  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/extensions/xpinstallConfirm.dtd)
-  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/extensions/xpinstallConfirm.properties)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (../components/extensions/locale/xpinstallConfirm.dtd)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (../components/extensions/locale/xpinstallConfirm.properties)
 
 % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
   locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (%chrome/pluginproblem/pluginproblem.dtd)
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 4c84923c4..cf5c542bd 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -20,8 +20,6 @@ DIRS += [
 if CONFIG['MOZ_JETPACK']:
     DIRS += ['jetpack']
 
-DIRS += ['mozapps/extensions']
-
 if CONFIG['MOZ_UPDATER']:
     DIRS += ['mozapps/update']
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
deleted file mode 100644
index 86cbbe82c..000000000
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-EXTRA_JS_MODULES.addons += [
-    'AddonLogging.jsm',
-    'AddonRepository.jsm',
-    'AddonRepository_SQLiteMigrator.jsm',
-    'Content.js',
-    'GMPProvider.jsm',
-    'LightweightThemeImageOptimizer.jsm',
-    'PluginProvider.jsm',
-    'ProductAddonChecker.jsm',
-    'SpellCheckDictionaryBootstrap.js',
-]
-
-EXTRA_PP_JS_MODULES.addons += [
-    'AddonUpdateChecker.jsm',
-    'XPIProvider.jsm',
-    'XPIProviderUtils.js',
-]
-
-# This is used in multiple places, so is defined here to avoid it getting
-# out of sync.
-DEFINES['MOZ_EXTENSIONS_DB_SCHEMA'] = 16
-
-# Additional debugging info is exposed in debug builds
-if CONFIG['MOZ_EM_DEBUG']:
-    DEFINES['MOZ_EM_DEBUG'] = 1
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
deleted file mode 100644
index 480bd72e3..000000000
--- a/toolkit/mozapps/extensions/moz.build
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-DIRS += ['internal']
-
-XPIDL_SOURCES += [
-    'amIAddonManager.idl',
-    'amIAddonPathService.idl',
-    'amIWebInstaller.idl',
-    'amIWebInstallListener.idl',
-]
-
-XPIDL_MODULE = 'extensions'
-
-EXTRA_COMPONENTS += [
-    'addonManager.js',
-    'amContentHandler.js',
-    'amInstallTrigger.js',
-    'amWebInstallListener.js',
-    'extensions.manifest',
-]
-
-EXTRA_JS_MODULES += [
-    'ChromeManifestParser.jsm',
-    'DeferredSave.jsm',
-    'LightweightThemeManager.jsm',
-]
-
-EXTRA_PP_JS_MODULES += [
-    'AddonManager.jsm',
-    'GMPInstallManager.jsm',
-    'GMPUtils.jsm',
-]
-
-# Additional debugging info is exposed in debug builds
-if CONFIG['MOZ_EM_DEBUG']:
-    DEFINES['MOZ_EM_DEBUG'] = 1
-
-JAR_MANIFESTS += ['jar.mn']
-
-EXPORTS.mozilla += [
-    'AddonPathService.h',
-]
-
-UNIFIED_SOURCES += [
-    'AddonPathService.cpp'
-]
-
-FINAL_LIBRARY = 'xul'