7 files changed, 79 insertions, 15 deletions
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
index 2ea55aff4..366842598 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -202,9 +202,17 @@ chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
 chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png
 chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
 chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png
+chrome/toolkit/skin/classic/mozapps/extensions/category-themes.png
+chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
+chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png
+chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png
+chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png
+chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png
 chrome/toolkit/skin/classic/mozapps/update/buttons.png
 chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png
 chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
+chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
+
 components/FxAccountsPush.js
 crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
 crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index ba7904719..bddca2f29 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -417,10 +417,14 @@
 @RESPATH@/components/addonManager.js
 @RESPATH@/components/amContentHandler.js
 @RESPATH@/components/amInstallTrigger.js
+#ifdef MOZ_WEBEXTENSIONS
 @RESPATH@/components/amWebAPI.js
+#endif
 @RESPATH@/components/amWebInstallListener.js
 @RESPATH@/components/nsBlocklistService.js
+#ifdef MOZ_WEBEXTENSIONS
 @RESPATH@/components/nsBlocklistServiceContent.js
+#endif
 #ifdef MOZ_UPDATER
 @RESPATH@/components/nsUpdateService.manifest
 @RESPATH@/components/nsUpdateService.js
@@ -569,9 +573,11 @@
 @RESPATH@/components/TestInterfaceJSMaplike.js
 #endif
 
+#ifdef MOZ_WEBEXTENSIONS
 ; [Extensions]
 @RESPATH@/components/extensions-toolkit.manifest
 @RESPATH@/browser/components/extensions-browser.manifest
+#endif
 
 ; Modules
 @RESPATH@/browser/modules/*
diff --git a/dom/plugins/test/unit/xpcshell.ini b/dom/plugins/test/unit/xpcshell.ini
index 8dae66b20..69b6731b2 100644
--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -5,7 +5,7 @@ tail =
 tags = addons
 firefox-appdir = browser
 support-files =
-  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
 
 [test_allowed_types.js]
 skip-if = appname == "thunderbird"
diff --git a/toolkit/modules/UpdateChannel.jsm b/toolkit/modules/UpdateChannel.jsm
new file mode 100644
index 000000000..c2bdce8ad
--- /dev/null
+++ b/toolkit/modules/UpdateChannel.jsm
@@ -0,0 +1,47 @@
+#filter substitution
+
+/* 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.EXPORTED_SYMBOLS = ["UpdateChannel"];
+
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+this.UpdateChannel = {
+  /**
+   * Read the update channel from defaults only.  We do this to ensure that
+   * the channel is tightly coupled with the application and does not apply
+   * to other instances of the application that may use the same profile.
+   *
+   * @param [optional] aIncludePartners
+   *        Whether or not to include the partner bits. Default: true.
+   */
+  get: function UpdateChannel_get(aIncludePartners = true) {
+    let channel = "@MOZ_UPDATE_CHANNEL@";
+    let defaults = Services.prefs.getDefaultBranch(null);
+    try {
+      channel = defaults.getCharPref("app.update.channel");
+    } catch (e) {
+      // use default value when pref not found
+    }
+
+    if (aIncludePartners) {
+      try {
+        let partners = Services.prefs.getChildList("app.partner.").sort();
+        if (partners.length) {
+          channel += "-cck";
+          partners.forEach(function (prefName) {
+            channel += "-" + Services.prefs.getCharPref(prefName);
+          });
+        }
+      } catch (e) {
+        Cu.reportError(e);
+      }
+    }
+
+    return channel;
+  }
+};
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 271c9b8f7..257741274 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -104,6 +104,9 @@ EXTRA_JS_MODULES += [
 EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
 EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
 
+if not CONFIG['MOZ_WEBEXTENSIONS']:
+  EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
 
diff --git a/toolkit/mozapps/webextensions/test/browser/browser-window.ini b/toolkit/mozapps/webextensions/test/browser/browser-window.ini
index fcda90fc6..ca9353d21 100644
--- a/toolkit/mozapps/webextensions/test/browser/browser-window.ini
+++ b/toolkit/mozapps/webextensions/test/browser/browser-window.ini
@@ -41,12 +41,12 @@ support-files =
   webapi_checkchromeframe.xul
   webapi_checkframed.html
   webapi_checknavigatedwindow.html
-  !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
-  !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html
+  !/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi
 
 [include:browser-common.ini]
diff --git a/toolkit/mozapps/webextensions/test/browser/browser.ini b/toolkit/mozapps/webextensions/test/browser/browser.ini
index a23841d33..8a144baba 100644
--- a/toolkit/mozapps/webextensions/test/browser/browser.ini
+++ b/toolkit/mozapps/webextensions/test/browser/browser.ini
@@ -41,13 +41,13 @@ support-files =
   webapi_checkchromeframe.xul
   webapi_checkframed.html
   webapi_checknavigatedwindow.html
-  !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
-  !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi
-  !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html
+  !/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi
+  !/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi
 
 [browser_addonrepository_performance.js]
 [browser_bug557956.js]