1100 files changed, 133 insertions, 106 deletions

diff --git a/browser/experiments/test/xpcshell/xpcshell.ini b/browser/experiments/test/xpcshell/xpcshell.ini
index 5ea30976cc..5921c9c478 100644
--- a/browser/experiments/test/xpcshell/xpcshell.ini
+++ b/browser/experiments/test/xpcshell/xpcshell.ini
@@ -10,7 +10,7 @@ support-files =
   experiment-1a.xpi
   experiment-2.xpi
   experiment-racybranch.xpi
-  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
 generated-files =
   experiment-1.xpi
   experiment-1a.xpi
diff --git a/services/sync/tests/unit/xpcshell.ini b/services/sync/tests/unit/xpcshell.ini
index e5b32e7b15..5a90652b84 100644
--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -13,8 +13,8 @@ support-files =
   sync_ping_schema.json
   systemaddon-search.xml
   !/services/common/tests/unit/head_helpers.js
-  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
-  !/toolkit/components/extensions/test/xpcshell/head_sync.js
+  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
+  !/toolkit/components/webextensions/test/xpcshell/head_sync.js
 
 # The manifest is roughly ordered from low-level to high-level. When making
 # systemic sweeping changes, this makes it easier to identify errors closer to
diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini
index 74067580a6..fe58d362ea 100644
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -15,7 +15,7 @@ support-files =
   system.xpi
   restartless.xpi
   theme.xpi
-  !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
   experiment.xpi
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd
index 4f9098966b..4f9098966b 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
index f393cc9063..f393cc9063 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd
index 99c940b33a..99c940b33a 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
index 10c0f81c35..10c0f81c35 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd
index 1307cebb97..1307cebb97 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties
index bd5997a263..bd5997a263 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd
index 6dd64a9c6f..6dd64a9c6f 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties
index c2d4ed90fc..c2d4ed90fc 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd
index 6a7d17a16e..6a7d17a16e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties
index d0b4e46ad0..d0b4e46ad0 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index c28cf6f499..e42f0de000 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -105,15 +105,17 @@
   locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (%chrome/mozapps/downloads/settingsChange.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
-  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
+#ifdef MOZ_WEBEXTENSIONS
+  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/webextensions/extensions.dtd)
 #ifndef MOZ_FENNEC
-  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/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.properties         (%chrome/mozapps/webextensions/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/webextensions/blocklist.dtd)
+  locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/webextensions/about.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/webextensions/update.dtd)
+  locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/webextensions/update.properties)
+  locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/webextensions/newaddon.dtd)
+  locale/@AB_CD@/mozapps/extensions/newaddon.properties           (%chrome/mozapps/webextensions/newaddon.properties)
+#endif
 #endif
   locale/@AB_CD@/mozapps/handling/handling.dtd                    (%chrome/mozapps/handling/handling.dtd)
   locale/@AB_CD@/mozapps/handling/handling.properties             (%chrome/mozapps/handling/handling.properties)
@@ -128,8 +130,10 @@
   locale/@AB_CD@/mozapps/update/updates.properties                (%chrome/mozapps/update/updates.properties)
 #endif
   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)
+#ifdef MOZ_WEBEXTENSIONS
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/webextensions/xpinstallConfirm.dtd)
+  locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/webextensions/xpinstallConfirm.properties)
+#endif
 % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
   locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (%chrome/pluginproblem/pluginproblem.dtd)
 % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
diff --git a/toolkit/moz.build b/toolkit/moz.build
index f3159137ca..9501938aec 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -13,7 +13,6 @@ DIRS += [
     'locales',
     'modules',
     'mozapps/downloads',
-    'mozapps/extensions',
     'mozapps/handling',
     'mozapps/preferences',
     'obsolete',
@@ -22,6 +21,9 @@ DIRS += [
     'themes',
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+    DIRS += ['mozapps/webextensions']
+
 if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['mozapps/update']
 
diff --git a/toolkit/mozapps/extensions/.eslintrc.js b/toolkit/mozapps/webextensions/.eslintrc.js
index 2b90bd053a..2b90bd053a 100644
--- a/toolkit/mozapps/extensions/.eslintrc.js
+++ b/toolkit/mozapps/webextensions/.eslintrc.js
diff --git a/toolkit/mozapps/extensions/AddonContentPolicy.cpp b/toolkit/mozapps/webextensions/AddonContentPolicy.cpp
index 90e53b2ea8..90e53b2ea8 100644
--- a/toolkit/mozapps/extensions/AddonContentPolicy.cpp
+++ b/toolkit/mozapps/webextensions/AddonContentPolicy.cpp
diff --git a/toolkit/mozapps/extensions/AddonContentPolicy.h b/toolkit/mozapps/webextensions/AddonContentPolicy.h
index 4c8af4828d..4c8af4828d 100644
--- a/toolkit/mozapps/extensions/AddonContentPolicy.h
+++ b/toolkit/mozapps/webextensions/AddonContentPolicy.h
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/webextensions/AddonManager.jsm
index c5cb80091e..c5cb80091e 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/webextensions/AddonManager.jsm
diff --git a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp b/toolkit/mozapps/webextensions/AddonManagerWebAPI.cpp
index 3f2a7a5299..3f2a7a5299 100644
--- a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp
+++ b/toolkit/mozapps/webextensions/AddonManagerWebAPI.cpp
diff --git a/toolkit/mozapps/extensions/AddonManagerWebAPI.h b/toolkit/mozapps/webextensions/AddonManagerWebAPI.h
index 6830bc91f6..6830bc91f6 100644
--- a/toolkit/mozapps/extensions/AddonManagerWebAPI.h
+++ b/toolkit/mozapps/webextensions/AddonManagerWebAPI.h
diff --git a/toolkit/mozapps/extensions/AddonPathService.cpp b/toolkit/mozapps/webextensions/AddonPathService.cpp
index 8a405c0ea4..8a405c0ea4 100644
--- a/toolkit/mozapps/extensions/AddonPathService.cpp
+++ b/toolkit/mozapps/webextensions/AddonPathService.cpp
diff --git a/toolkit/mozapps/extensions/AddonPathService.h b/toolkit/mozapps/webextensions/AddonPathService.h
index f739b018f3..f739b018f3 100644
--- a/toolkit/mozapps/extensions/AddonPathService.h
+++ b/toolkit/mozapps/webextensions/AddonPathService.h
diff --git a/toolkit/mozapps/extensions/ChromeManifestParser.jsm b/toolkit/mozapps/webextensions/ChromeManifestParser.jsm
index 63f1db785a..63f1db785a 100644
--- a/toolkit/mozapps/extensions/ChromeManifestParser.jsm
+++ b/toolkit/mozapps/webextensions/ChromeManifestParser.jsm
diff --git a/toolkit/mozapps/extensions/DeferredSave.jsm b/toolkit/mozapps/webextensions/DeferredSave.jsm
index 89f82b2656..89f82b2656 100644
--- a/toolkit/mozapps/extensions/DeferredSave.jsm
+++ b/toolkit/mozapps/webextensions/DeferredSave.jsm
diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/mozapps/webextensions/LightweightThemeManager.jsm
index 5dd41831df..5dd41831df 100644
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/mozapps/webextensions/LightweightThemeManager.jsm
diff --git a/toolkit/mozapps/extensions/addonManager.js b/toolkit/mozapps/webextensions/addonManager.js
index d34cbaf624..d34cbaf624 100644
--- a/toolkit/mozapps/extensions/addonManager.js
+++ b/toolkit/mozapps/webextensions/addonManager.js
diff --git a/toolkit/mozapps/extensions/amContentHandler.js b/toolkit/mozapps/webextensions/amContentHandler.js
index 8dc4dfecdc..8dc4dfecdc 100644
--- a/toolkit/mozapps/extensions/amContentHandler.js
+++ b/toolkit/mozapps/webextensions/amContentHandler.js
diff --git a/toolkit/mozapps/extensions/amIAddonManager.idl b/toolkit/mozapps/webextensions/amIAddonManager.idl
index 58a58b62d4..58a58b62d4 100644
--- a/toolkit/mozapps/extensions/amIAddonManager.idl
+++ b/toolkit/mozapps/webextensions/amIAddonManager.idl
diff --git a/toolkit/mozapps/extensions/amIAddonPathService.idl b/toolkit/mozapps/webextensions/amIAddonPathService.idl
index 9c9197a61c..9c9197a61c 100644
--- a/toolkit/mozapps/extensions/amIAddonPathService.idl
+++ b/toolkit/mozapps/webextensions/amIAddonPathService.idl
diff --git a/toolkit/mozapps/extensions/amIWebInstallListener.idl b/toolkit/mozapps/webextensions/amIWebInstallListener.idl
index eed1080977..eed1080977 100644
--- a/toolkit/mozapps/extensions/amIWebInstallListener.idl
+++ b/toolkit/mozapps/webextensions/amIWebInstallListener.idl
diff --git a/toolkit/mozapps/extensions/amIWebInstaller.idl b/toolkit/mozapps/webextensions/amIWebInstaller.idl
index 6c5ebca67c..6c5ebca67c 100644
--- a/toolkit/mozapps/extensions/amIWebInstaller.idl
+++ b/toolkit/mozapps/webextensions/amIWebInstaller.idl
diff --git a/toolkit/mozapps/extensions/amInstallTrigger.js b/toolkit/mozapps/webextensions/amInstallTrigger.js
index 382791d326..382791d326 100644
--- a/toolkit/mozapps/extensions/amInstallTrigger.js
+++ b/toolkit/mozapps/webextensions/amInstallTrigger.js
diff --git a/toolkit/mozapps/extensions/amWebAPI.js b/toolkit/mozapps/webextensions/amWebAPI.js
index 5ad0d23f1f..5ad0d23f1f 100644
--- a/toolkit/mozapps/extensions/amWebAPI.js
+++ b/toolkit/mozapps/webextensions/amWebAPI.js
diff --git a/toolkit/mozapps/extensions/amWebInstallListener.js b/toolkit/mozapps/webextensions/amWebInstallListener.js
index 0bcc345e83..0bcc345e83 100644
--- a/toolkit/mozapps/extensions/amWebInstallListener.js
+++ b/toolkit/mozapps/webextensions/amWebInstallListener.js
diff --git a/toolkit/mozapps/extensions/content/OpenH264-license.txt b/toolkit/mozapps/webextensions/content/OpenH264-license.txt
index ad37989b8c..ad37989b8c 100644
--- a/toolkit/mozapps/extensions/content/OpenH264-license.txt
+++ b/toolkit/mozapps/webextensions/content/OpenH264-license.txt
diff --git a/toolkit/mozapps/extensions/content/about.js b/toolkit/mozapps/webextensions/content/about.js
index 4f8fb353eb..4f8fb353eb 100644
--- a/toolkit/mozapps/extensions/content/about.js
+++ b/toolkit/mozapps/webextensions/content/about.js
diff --git a/toolkit/mozapps/extensions/content/about.xul b/toolkit/mozapps/webextensions/content/about.xul
index 6effcf37aa..6effcf37aa 100644
--- a/toolkit/mozapps/extensions/content/about.xul
+++ b/toolkit/mozapps/webextensions/content/about.xul
diff --git a/toolkit/mozapps/extensions/content/blocklist.css b/toolkit/mozapps/webextensions/content/blocklist.css
index cb48005a24..cb48005a24 100644
--- a/toolkit/mozapps/extensions/content/blocklist.css
+++ b/toolkit/mozapps/webextensions/content/blocklist.css
diff --git a/toolkit/mozapps/extensions/content/blocklist.js b/toolkit/mozapps/webextensions/content/blocklist.js
index 6d524e6eee..6d524e6eee 100644
--- a/toolkit/mozapps/extensions/content/blocklist.js
+++ b/toolkit/mozapps/webextensions/content/blocklist.js
diff --git a/toolkit/mozapps/extensions/content/blocklist.xml b/toolkit/mozapps/webextensions/content/blocklist.xml
index 74474392fa..74474392fa 100644
--- a/toolkit/mozapps/extensions/content/blocklist.xml
+++ b/toolkit/mozapps/webextensions/content/blocklist.xml
diff --git a/toolkit/mozapps/extensions/content/blocklist.xul b/toolkit/mozapps/webextensions/content/blocklist.xul
index 240d9e4e1e..240d9e4e1e 100644
--- a/toolkit/mozapps/extensions/content/blocklist.xul
+++ b/toolkit/mozapps/webextensions/content/blocklist.xul
diff --git a/toolkit/mozapps/extensions/content/eula.js b/toolkit/mozapps/webextensions/content/eula.js
index 537ee7284b..537ee7284b 100644
--- a/toolkit/mozapps/extensions/content/eula.js
+++ b/toolkit/mozapps/webextensions/content/eula.js
diff --git a/toolkit/mozapps/extensions/content/eula.xul b/toolkit/mozapps/webextensions/content/eula.xul
index 10e6579519..10e6579519 100644
--- a/toolkit/mozapps/extensions/content/eula.xul
+++ b/toolkit/mozapps/webextensions/content/eula.xul
diff --git a/toolkit/mozapps/extensions/content/extensions.css b/toolkit/mozapps/webextensions/content/extensions.css
index cb5313365f..cb5313365f 100644
--- a/toolkit/mozapps/extensions/content/extensions.css
+++ b/toolkit/mozapps/webextensions/content/extensions.css
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/webextensions/content/extensions.js
index 56158d9c63..56158d9c63 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/webextensions/content/extensions.js
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/webextensions/content/extensions.xml
index b49645cf0a..b49645cf0a 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/webextensions/content/extensions.xml
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/webextensions/content/extensions.xul
index 70939d0248..70939d0248 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/webextensions/content/extensions.xul
diff --git a/toolkit/mozapps/extensions/content/gmpPrefs.xul b/toolkit/mozapps/webextensions/content/gmpPrefs.xul
index ea7ee92faf..ea7ee92faf 100644
--- a/toolkit/mozapps/extensions/content/gmpPrefs.xul
+++ b/toolkit/mozapps/webextensions/content/gmpPrefs.xul
diff --git a/toolkit/mozapps/extensions/content/list.js b/toolkit/mozapps/webextensions/content/list.js
index a31922703e..a31922703e 100644
--- a/toolkit/mozapps/extensions/content/list.js
+++ b/toolkit/mozapps/webextensions/content/list.js
diff --git a/toolkit/mozapps/extensions/content/list.xul b/toolkit/mozapps/webextensions/content/list.xul
index 65efeb6a2a..65efeb6a2a 100644
--- a/toolkit/mozapps/extensions/content/list.xul
+++ b/toolkit/mozapps/webextensions/content/list.xul
diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/webextensions/content/newaddon.js
index b1ad5631b5..b1ad5631b5 100644
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/mozapps/webextensions/content/newaddon.js
diff --git a/toolkit/mozapps/extensions/content/newaddon.xul b/toolkit/mozapps/webextensions/content/newaddon.xul
index 1d85452492..1d85452492 100644
--- a/toolkit/mozapps/extensions/content/newaddon.xul
+++ b/toolkit/mozapps/webextensions/content/newaddon.xul
diff --git a/toolkit/mozapps/extensions/content/pluginPrefs.xul b/toolkit/mozapps/webextensions/content/pluginPrefs.xul
index c3fdbfa5b5..c3fdbfa5b5 100644
--- a/toolkit/mozapps/extensions/content/pluginPrefs.xul
+++ b/toolkit/mozapps/webextensions/content/pluginPrefs.xul
diff --git a/toolkit/mozapps/extensions/content/setting.xml b/toolkit/mozapps/webextensions/content/setting.xml
index 2b70eb0d04..2b70eb0d04 100644
--- a/toolkit/mozapps/extensions/content/setting.xml
+++ b/toolkit/mozapps/webextensions/content/setting.xml
diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/mozapps/webextensions/content/update.js
index 80d0fa6885..80d0fa6885 100644
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/webextensions/content/update.js
diff --git a/toolkit/mozapps/extensions/content/update.xul b/toolkit/mozapps/webextensions/content/update.xul
index 7459838145..7459838145 100644
--- a/toolkit/mozapps/extensions/content/update.xul
+++ b/toolkit/mozapps/webextensions/content/update.xul
diff --git a/toolkit/mozapps/extensions/content/updateinfo.xsl b/toolkit/mozapps/webextensions/content/updateinfo.xsl
index 5fcccd6d7a..5fcccd6d7a 100644
--- a/toolkit/mozapps/extensions/content/updateinfo.xsl
+++ b/toolkit/mozapps/webextensions/content/updateinfo.xsl
diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.css b/toolkit/mozapps/webextensions/content/xpinstallConfirm.css
index 583facfec1..583facfec1 100644
--- a/toolkit/mozapps/extensions/content/xpinstallConfirm.css
+++ b/toolkit/mozapps/webextensions/content/xpinstallConfirm.css
diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.js b/toolkit/mozapps/webextensions/content/xpinstallConfirm.js
index 5660cdaaf7..5660cdaaf7 100644
--- a/toolkit/mozapps/extensions/content/xpinstallConfirm.js
+++ b/toolkit/mozapps/webextensions/content/xpinstallConfirm.js
diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.xul b/toolkit/mozapps/webextensions/content/xpinstallConfirm.xul
index f1c29eb73c..f1c29eb73c 100644
--- a/toolkit/mozapps/extensions/content/xpinstallConfirm.xul
+++ b/toolkit/mozapps/webextensions/content/xpinstallConfirm.xul
diff --git a/toolkit/mozapps/extensions/content/xpinstallItem.xml b/toolkit/mozapps/webextensions/content/xpinstallItem.xml
index 5146af84f1..5146af84f1 100644
--- a/toolkit/mozapps/extensions/content/xpinstallItem.xml
+++ b/toolkit/mozapps/webextensions/content/xpinstallItem.xml
diff --git a/toolkit/mozapps/extensions/docs/SystemAddons.rst b/toolkit/mozapps/webextensions/docs/SystemAddons.rst
index 5f724e9ef2..5f724e9ef2 100644
--- a/toolkit/mozapps/extensions/docs/SystemAddons.rst
+++ b/toolkit/mozapps/webextensions/docs/SystemAddons.rst
diff --git a/toolkit/mozapps/extensions/docs/index.rst b/toolkit/mozapps/webextensions/docs/index.rst
index ab6ed3c707..ab6ed3c707 100644
--- a/toolkit/mozapps/extensions/docs/index.rst
+++ b/toolkit/mozapps/webextensions/docs/index.rst
diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/webextensions/extensions.manifest
index c7d2ee386f..c7d2ee386f 100644
--- a/toolkit/mozapps/extensions/extensions.manifest
+++ b/toolkit/mozapps/webextensions/extensions.manifest
diff --git a/toolkit/mozapps/extensions/internal/APIExtensionBootstrap.js b/toolkit/mozapps/webextensions/internal/APIExtensionBootstrap.js
index 0eae2475c4..0eae2475c4 100644
--- a/toolkit/mozapps/extensions/internal/APIExtensionBootstrap.js
+++ b/toolkit/mozapps/webextensions/internal/APIExtensionBootstrap.js
diff --git a/toolkit/mozapps/extensions/internal/AddonConstants.jsm b/toolkit/mozapps/webextensions/internal/AddonConstants.jsm
index 22d91fdf5b..22d91fdf5b 100644
--- a/toolkit/mozapps/extensions/internal/AddonConstants.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonConstants.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonLogging.jsm b/toolkit/mozapps/webextensions/internal/AddonLogging.jsm
index f05a6fe6c3..f05a6fe6c3 100644
--- a/toolkit/mozapps/extensions/internal/AddonLogging.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonLogging.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/mozapps/webextensions/internal/AddonRepository.jsm
index 7f88d44ad3..7f88d44ad3 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonRepository.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm b/toolkit/mozapps/webextensions/internal/AddonRepository_SQLiteMigrator.jsm
index e3479643be..e3479643be 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonRepository_SQLiteMigrator.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm b/toolkit/mozapps/webextensions/internal/AddonTestUtils.jsm
index 6422929b1c..6422929b1c 100644
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonTestUtils.jsm
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
index 63c16737c3..63c16737c3 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
diff --git a/toolkit/mozapps/extensions/internal/Content.js b/toolkit/mozapps/webextensions/internal/Content.js
index 9f366ba327..9f366ba327 100644
--- a/toolkit/mozapps/extensions/internal/Content.js
+++ b/toolkit/mozapps/webextensions/internal/Content.js
diff --git a/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm b/toolkit/mozapps/webextensions/internal/E10SAddonsRollout.jsm
index 3bcee44d34..3bcee44d34 100644
--- a/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
+++ b/toolkit/mozapps/webextensions/internal/E10SAddonsRollout.jsm
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/webextensions/internal/GMPProvider.jsm
index 9bb34a7af6..9bb34a7af6 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/webextensions/internal/GMPProvider.jsm
diff --git a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm b/toolkit/mozapps/webextensions/internal/LightweightThemeImageOptimizer.jsm
index 49dfa237fe..49dfa237fe 100644
--- a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
+++ b/toolkit/mozapps/webextensions/internal/LightweightThemeImageOptimizer.jsm
diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/mozapps/webextensions/internal/PluginProvider.jsm
index 075159a9ac..075159a9ac 100644
--- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm
+++ b/toolkit/mozapps/webextensions/internal/PluginProvider.jsm
diff --git a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm b/toolkit/mozapps/webextensions/internal/ProductAddonChecker.jsm
index f98dd2a943..f98dd2a943 100644
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/webextensions/internal/ProductAddonChecker.jsm
diff --git a/toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js b/toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js
index f4f557fc22..f4f557fc22 100644
--- a/toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js
+++ b/toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js
diff --git a/toolkit/mozapps/extensions/internal/WebExtensionBootstrap.js b/toolkit/mozapps/webextensions/internal/WebExtensionBootstrap.js
index a920c2eae8..a920c2eae8 100644
--- a/toolkit/mozapps/extensions/internal/WebExtensionBootstrap.js
+++ b/toolkit/mozapps/webextensions/internal/WebExtensionBootstrap.js
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
index 87e09cef18..87e09cef18 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/mozapps/webextensions/internal/XPIProviderUtils.js
index d04eb207c6..d04eb207c6 100644
--- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
+++ b/toolkit/mozapps/webextensions/internal/XPIProviderUtils.js
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/webextensions/internal/moz.build
index 28c34f8c99..28c34f8c99 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/webextensions/internal/moz.build
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/webextensions/jar.mn
index ecf64b7efa..ecf64b7efa 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/webextensions/jar.mn
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/webextensions/moz.build
index 12640e1154..12640e1154 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/webextensions/moz.build
diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/webextensions/nsBlocklistService.js
index 0af90430cb..0af90430cb 100644
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/webextensions/nsBlocklistService.js
diff --git a/toolkit/mozapps/extensions/nsBlocklistServiceContent.js b/toolkit/mozapps/webextensions/nsBlocklistServiceContent.js
index 1752924b52..1752924b52 100644
--- a/toolkit/mozapps/extensions/nsBlocklistServiceContent.js
+++ b/toolkit/mozapps/webextensions/nsBlocklistServiceContent.js
diff --git a/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm b/toolkit/mozapps/webextensions/test/AddonManagerTesting.jsm
index eb9a921959..eb9a921959 100644
--- a/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm
+++ b/toolkit/mozapps/webextensions/test/AddonManagerTesting.jsm
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/webextensions/test/Makefile.in
index 6c667ecab9..6c667ecab9 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/webextensions/test/Makefile.in
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_1/install.rdf
index 7b1b02a17e..7b1b02a17e 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_2/install.rdf
index ae364637e1..ae364637e1 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_3/install.rdf
index 568c41a43f..568c41a43f 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_1/install.rdf
index 1281ab53f6..1281ab53f6 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_2/install.rdf
index 8b6dd09f5f..8b6dd09f5f 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_3/install.rdf
index fade395f98..fade395f98 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_1/install.rdf
index 4a18f64e00..4a18f64e00 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_2/install.rdf
index 8a25192227..8a25192227 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_3/install.rdf
index 2c55e5ff7c..2c55e5ff7c 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_1/install.rdf
index eebac4b21e..eebac4b21e 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_2/install.rdf
index f37741d044..f37741d044 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_3/install.rdf
index e15f99264b..e15f99264b 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_1/install.rdf
index f4b70a24b0..f4b70a24b0 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_2/install.rdf
index 987204fa60..987204fa60 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_3/install.rdf
index 19ab4b9fe1..19ab4b9fe1 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_1/install.rdf
index a3cd06f5fe..a3cd06f5fe 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_2/install.rdf
index eeff9fb796..eeff9fb796 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_3/install.rdf
index 1d26506038..1d26506038 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_1/install.rdf
index 85d7108d60..85d7108d60 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_2/install.rdf
index 394fd909e5..394fd909e5 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_3/install.rdf
index 2a1fec25aa..2a1fec25aa 100644
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/bootstrap_globals/bootstrap.js
index a5d5beb342..a5d5beb342 100644
--- a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/bootstrap_globals/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf b/toolkit/mozapps/webextensions/test/addons/bootstrap_globals/install.rdf
index f11a626fd0..f11a626fd0 100644
--- a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/bootstrap_globals/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/min1max1/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max1/install.rdf
index 3a0ace227d..3a0ace227d 100644
--- a/toolkit/mozapps/extensions/test/addons/min1max1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/min1max1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/min1max2/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max2/install.rdf
index 0184f19638..0184f19638 100644
--- a/toolkit/mozapps/extensions/test/addons/min1max2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/min1max2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/min1max3/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max3/install.rdf
index dbb1b73181..dbb1b73181 100644
--- a/toolkit/mozapps/extensions/test/addons/min1max3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/min1max3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max3b/install.rdf
index f50c65c6aa..f50c65c6aa 100644
--- a/toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/min1max3b/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf b/toolkit/mozapps/webextensions/test/addons/override1x2-1x3/install.rdf
index 92cf3ec969..92cf3ec969 100644
--- a/toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/override1x2-1x3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_1/install.rdf
index 82cfd0472f..82cfd0472f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_2/install.rdf
index 80776e6c34..80776e6c34 100644
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/icon.png
index 41409edfea..41409edfea 100644
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/icon.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/install.rdf
index bade9c0693..bade9c0693 100644
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/preview.png
index 321ce47cfa..321ce47cfa 100644
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/preview.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/install.rdf
index f02a3869c3..f02a3869c3 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/version.jsm
index 7fe60e632d..7fe60e632d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/version.jsm
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/install.rdf
index 480f03fd17..480f03fd17 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/version.jsm
index 532741e121..532741e121 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/version.jsm
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/install.rdf
index e9385cbb37..e9385cbb37 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/version.jsm
index 1b813faaf4..1b813faaf4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/version.jsm
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_4/install.rdf
index 2b88e0ad0b..2b88e0ad0b 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/install.rdf
index e0e8ca978c..e0e8ca978c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/bootstrap.js
index 0e45caec4f..0e45caec4f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/install.rdf
index 898282991c..898282991c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_2/install.rdf
index 791a6263f5..791a6263f5 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_a_1/install.rdf
index 36d15b8aab..36d15b8aab 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_a_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_a_2/install.rdf
index 3521a503c8..3521a503c8 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_a_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_b_1/install.rdf
index d92a4ec410..d92a4ec410 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_b_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_b_2/install.rdf
index c3ad76b845..c3ad76b845 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_b_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_c_1/install.rdf
index a937b6e76c..a937b6e76c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_c_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_c_2/install.rdf
index 8afca3ff98..8afca3ff98 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_c_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_d_1/install.rdf
index 4c0dcc2efb..4c0dcc2efb 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_d_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_d_2/install.rdf
index 2b113809a1..2b113809a1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_d_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_e_1/install.rdf
index 03eb7180e2..03eb7180e2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_e_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_e_2/install.rdf
index 3ed7cd9320..3ed7cd9320 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_e_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_f_1/install.rdf
index cacf824c13..cacf824c13 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_f_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_f_2/install.rdf
index 09954ec365..09954ec365 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_f_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_g_1/install.rdf
index 5e4a6f6a2b..5e4a6f6a2b 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_g_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_g_2/install.rdf
index 913233cec3..913233cec3 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug299716_g_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_1/install.rdf
index fd0dd50b77..fd0dd50b77 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_2/install.rdf
index 607b68357e..607b68357e 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_3/install.rdf
index 3a4c7eafc8..3a4c7eafc8 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_4/install.rdf
index 8557df116d..8557df116d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_5/install.rdf
index 343a9d44c1..343a9d44c1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_6/install.rdf
index 5a724cc99f..5a724cc99f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_7/install.rdf
index 70fe811683..70fe811683 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_7/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_8/install.rdf
index 2aface3b43..2aface3b43 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_8/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_9/install.rdf
index 7804e833c2..7804e833c2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug324121_9/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_1/install.rdf
index c60b5711b1..c60b5711b1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug335238_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_2/install.rdf
index 23faf5a34f..23faf5a34f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug335238_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_3/install.rdf
index d44448208d..d44448208d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug335238_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_4/install.rdf
index 6ec052d36c..6ec052d36c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug335238_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug371495/install.rdf
index c60caf5941..c60caf5941 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug371495/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug394300_1/install.rdf
index 2e5ace7608..2e5ace7608 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug394300_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug394300_2/install.rdf
index ae54424d13..ae54424d13 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug394300_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug397778/install.rdf
index cfcfd406f1..cfcfd406f1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug397778/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug425657/install.rdf
index e4e1b339bd..e4e1b339bd 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug425657/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_1/install.rdf
index 5397e8a872..5397e8a872 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug470377_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_2/install.rdf
index b1dde7f7ae..b1dde7f7ae 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug470377_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_3/install.rdf
index ae483434a6..ae483434a6 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug470377_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_4/install.rdf
index 97abacc5e1..97abacc5e1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug470377_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_5/install.rdf
index bff1104a76..bff1104a76 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug470377_5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug521905/install.rdf
index 444bdc556b..444bdc556b 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug521905/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug567173/install.rdf
index f97bd13026..f97bd13026 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug567173/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug567184/bootstrap.js
index 09c0835320..09c0835320 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug567184/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug567184/install.rdf
index 1e13ceb873..1e13ceb873 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug567184/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/install.rdf
index 83220ce067..83220ce067 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile
index d2277257f5..d2277257f5 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1 b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile1
index e69de29bb2..e69de29bb2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile1
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/install.rdf
index ba23ab802e..ba23ab802e 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile
index 07afddfa7f..07afddfa7f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2 b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile2
index e69de29bb2..e69de29bb2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile2
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1 b/toolkit/mozapps/webextensions/test/addons/test_bug594058/directory/file1
index e69de29bb2..e69de29bb2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug594058/directory/file1
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug594058/install.rdf
index 682831949b..682831949b 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug594058/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug595573/install.rdf
index 36c03fd005..36c03fd005 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug595573/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug655254/install.rdf
index a3fa0d7075..a3fa0d7075 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug655254/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug655254_2/bootstrap.js
index b79648e893..b79648e893 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug655254_2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug655254_2/install.rdf
index 71827885f7..71827885f7 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug655254_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug659772/install.rdf
index 3b34c63d36..3b34c63d36 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug659772/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_bug675371/chrome.manifest
index 17d5c99ec4..17d5c99ec4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug675371/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug675371/install.rdf
index ca2881e5ac..ca2881e5ac 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug675371/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js b/toolkit/mozapps/webextensions/test/addons/test_bug675371/test.js
index b942a80648..b942a80648 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug675371/test.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug740612_1/bootstrap.js
index 6703e7f7d7..6703e7f7d7 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug740612_1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug740612_1/install.rdf
index b2316273f9..b2316273f9 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug740612_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug740612_2/bootstrap.js
index 2ad4814531..2ad4814531 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug740612_2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug740612_2/install.rdf
index ff4d613ef2..ff4d613ef2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug740612_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug757663/install.rdf
index be8d85b1b1..be8d85b1b1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_bug757663/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_cacheflush1/install.rdf
index 5e64b65c19..5e64b65c19 100644
--- a/toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_cacheflush1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_cacheflush2/install.rdf
index 7728002ea3..7728002ea3 100644
--- a/toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_cacheflush2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/chrome.manifest
index 4d63b6b06a..4d63b6b06a 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/install.rdf
index 486be86700..486be86700 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/chrome.manifest
index 3b0195077c..3b0195077c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/install.rdf
index 9a9ee4823c..9a9ee4823c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/chrome.manifest
index 73190ed8f5..73190ed8f5 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/inner.jar
index b4a40052f4..b4a40052f4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/inner.jar
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/install.rdf
index 3a4a709e09..3a4a709e09 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/chrome.manifest
index 60d4f01f09..60d4f01f09 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/components.manifest
index 1e0aea4403..1e0aea4403 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/components.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/other/something.manifest
index 73d58dd668..73d58dd668 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/other/something.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/install.rdf
index 463e3f27ef..463e3f27ef 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/chrome.manifest
index b0aa32adc7..b0aa32adc7 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/install.rdf
index 7836bced8d..7836bced8d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/chrome.manifest
index 4ebb75c305..4ebb75c305 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/install.rdf
index 5d94de0ea0..5d94de0ea0 100644
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_data_directory/install.rdf
index aebfe3b685..aebfe3b685 100644
--- a/toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_data_directory/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_1/install.rdf
index e1f2b51735..e1f2b51735 100644
--- a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_2/install.rdf
index da9b067ab6..da9b067ab6 100644
--- a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/bootstrap.js
index c5a80c7b97..c5a80c7b97 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/install.rdf
index 3ebbe16b07..3ebbe16b07 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json
index 1a98f4660c..1a98f4660c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/bootstrap.js
index dea028488c..dea028488c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/install.rdf
index 75c7666bba..75c7666bba 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json
index 9561979dc9..9561979dc9 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/bootstrap.js
index fb8fc95408..fb8fc95408 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/install.rdf
index aec4b202ee..aec4b202ee 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json
index d9200ec11c..d9200ec11c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json
+++ b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_dictionary/chrome.manifest
index c945c928ce..c945c928ce 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic b/toolkit/mozapps/webextensions/test/addons/test_dictionary/dictionaries/ab-CD.dic
index 3feac546d4..3feac546d4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary/dictionaries/ab-CD.dic
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary/install.rdf
index 9e66ab237e..9e66ab237e 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic b/toolkit/mozapps/webextensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic
index b35b9c1a6a..b35b9c1a6a 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_2/install.rdf
index a74a114fdd..a74a114fdd 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_3/install.rdf
index c056e87ff7..c056e87ff7 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_4/install.rdf
index 7470284ba8..7470284ba8 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_5/install.rdf
index 11eba90d7e..11eba90d7e 100644
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_dictionary_5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_distribution1_2/install.rdf
index 8bd5966c95..8bd5966c95 100644
--- a/toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_distribution1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_experiment1/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_experiment1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_experiment1/install.rdf
index 414a36b30e..414a36b30e 100644
--- a/toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_experiment1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_filepointer/install.rdf
index 5e64b65c19..5e64b65c19 100644
--- a/toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_filepointer/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/icon.png b/toolkit/mozapps/webextensions/test/addons/test_getresource/icon.png
index 40765b0e23..40765b0e23 100644
--- a/toolkit/mozapps/extensions/test/addons/test_getresource/icon.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_getresource/icon.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_getresource/install.rdf
index 8d2740dbbc..8d2740dbbc 100644
--- a/toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_getresource/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt b/toolkit/mozapps/webextensions/test/addons/test_getresource/subdir/subfile.txt
index a28d18162c..a28d18162c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt
+++ b/toolkit/mozapps/webextensions/test/addons/test_getresource/subdir/subfile.txt
diff --git a/toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_hotfix_1/install.rdf
index 7fcc1a09e8..7fcc1a09e8 100644
--- a/toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_hotfix_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_hotfix_2/install.rdf
index fd843dbe97..fd843dbe97 100644
--- a/toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_hotfix_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/icon.png b/toolkit/mozapps/webextensions/test/addons/test_install1/icon.png
index 41409edfea..41409edfea 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install1/icon.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_install1/icon.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/icon64.png b/toolkit/mozapps/webextensions/test/addons/test_install1/icon64.png
index 41409edfea..41409edfea 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install1/icon64.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_install1/icon64.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install1/install.rdf
index efe3f18ae1..efe3f18ae1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png b/toolkit/mozapps/webextensions/test/addons/test_install2_1/icon.png
index 41409edfea..41409edfea 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_install2_1/icon.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install2_1/install.rdf
index 116eb70697..116eb70697 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install2_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install2_2/install.rdf
index 7197ea1fbe..7197ea1fbe 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install2_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install3/install.rdf
index 8e72017ade..8e72017ade 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi b/toolkit/mozapps/webextensions/test/addons/test_install4/addon4.xpi
index e57a4f5b66..e57a4f5b66 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/addon4.xpi
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar b/toolkit/mozapps/webextensions/test/addons/test_install4/addon5.jar
index 93fbfbe6e1..93fbfbe6e1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/addon5.jar
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi b/toolkit/mozapps/webextensions/test/addons/test_install4/addon6.xpi
index 3613dab047..3613dab047 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/addon6.xpi
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar b/toolkit/mozapps/webextensions/test/addons/test_install4/addon7.jar
index 1af178887d..1af178887d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/addon7.jar
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar b/toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.jar
index 33695b99f4..33695b99f4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.jar
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi b/toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.xpi
index 33695b99f4..33695b99f4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.xpi
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/icon.png b/toolkit/mozapps/webextensions/test/addons/test_install4/icon.png
index 57f2c2eb63..57f2c2eb63 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/icon.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/icon.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install4/install.rdf
index 5e99ae29ae..5e99ae29ae 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_install5/chrome.manifest
index 703adf2a74..703adf2a74 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_install5/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_install5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install5/install.rdf
index 1f96e4b493..1f96e4b493 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install6/install.rdf
index b1f97c1fd4..b1f97c1fd4 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi b/toolkit/mozapps/webextensions/test/addons/test_install7/addon1.xpi
index 9c283d1d42..9c283d1d42 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi
+++ b/toolkit/mozapps/webextensions/test/addons/test_install7/addon1.xpi
diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi b/toolkit/mozapps/webextensions/test/addons/test_install7/addon2.xpi
index 9c283d1d42..9c283d1d42 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi
+++ b/toolkit/mozapps/webextensions/test/addons/test_install7/addon2.xpi
diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install7/install.rdf
index 5e99ae29ae..5e99ae29ae 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install7/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install7/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_install8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install8/install.rdf
index 5e99ae29ae..5e99ae29ae 100644
--- a/toolkit/mozapps/extensions/test/addons/test_install8/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_install8/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_jetpack/bootstrap.js
index 2449baeb85..2449baeb85 100644
--- a/toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_jetpack/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json b/toolkit/mozapps/webextensions/test/addons/test_jetpack/harness-options.json
index 9e26dfeeb6..9e26dfeeb6 100644
--- a/toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json
+++ b/toolkit/mozapps/webextensions/test/addons/test_jetpack/harness-options.json
diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_jetpack/install.rdf
index e88794a60d..e88794a60d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_jetpack/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_langpack/chrome.manifest
index 16fe819a21..16fe819a21 100644
--- a/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_langpack/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_langpack/install.rdf
index 056f6dff56..056f6dff56 100644
--- a/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_langpack/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_locale/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_locale/install.rdf
index d8d027b93f..d8d027b93f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_locale/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_locale/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_locked2_5/install.rdf
index 09655c2a67..09655c2a67 100644
--- a/toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_locked2_5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_locked2_6/install.rdf
index 75f110d2a1..75f110d2a1 100644
--- a/toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_locked2_6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate4_6/install.rdf
index 5924982f72..5924982f72 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate4_6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate4_7/install.rdf
index 072751cf26..072751cf26 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate4_7/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate6/install.rdf
index ff8280ae3d..ff8280ae3d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate7/install.rdf
index fd1df0e08f..fd1df0e08f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate7/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_migrate8/chrome.manifest
index 8570bae82f..8570bae82f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate8/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate8/install.rdf
index 61ed24763d..61ed24763d 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate8/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate9/install.rdf
index 116dd0176e..116dd0176e 100644
--- a/toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_migrate9/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_symbol/bootstrap.js
index 4eb8b4875f..4eb8b4875f 100644
--- a/toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_symbol/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_symbol/install.rdf
index adccda5521..adccda5521 100644
--- a/toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_symbol/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_theme/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_theme/install.rdf
index e1a37d0a49..e1a37d0a49 100644
--- a/toolkit/mozapps/extensions/test/addons/test_theme/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_theme/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_theme/preview.png b/toolkit/mozapps/webextensions/test/addons/test_theme/preview.png
index 321ce47cfa..321ce47cfa 100644
--- a/toolkit/mozapps/extensions/test/addons/test_theme/preview.png
+++ b/toolkit/mozapps/webextensions/test/addons/test_theme/preview.png
diff --git a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_undoincompatible/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_undoincompatible/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_undoincompatible/install.rdf
index b038ebc51c..b038ebc51c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_undoincompatible/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_undouninstall1/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_undouninstall1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_undouninstall1/install.rdf
index 4178fe9299..4178fe9299 100644
--- a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_undouninstall1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_update/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update/install.rdf
index 801a35a8f7..801a35a8f7 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_update/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_update12/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update12/install.rdf
index 3589cb55cd..3589cb55cd 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update12/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_update12/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_update8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update8/install.rdf
index 43e31af423..43e31af423 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update8/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_update8/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_update_multi1/bootstrap.js
index 24c778c096..24c778c096 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_update_multi1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update_multi1/install.rdf
index 9f955562ca..9f955562ca 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_update_multi1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi b/toolkit/mozapps/webextensions/test/addons/test_update_multi2/addon.xpi
index febff06fa2..febff06fa2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi
+++ b/toolkit/mozapps/webextensions/test/addons/test_update_multi2/addon.xpi
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update_multi2/install.rdf
index 44bdb05ba2..44bdb05ba2 100644
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_update_multi2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_updateid1/bootstrap.js
index 24c778c096..24c778c096 100644
--- a/toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_updateid1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_updateid1/install.rdf
index 803b64e5f7..803b64e5f7 100644
--- a/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_updateid1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_updateid2/bootstrap.js
index 24c778c096..24c778c096 100644
--- a/toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/addons/test_updateid2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_updateid2/install.rdf
index 041af57f05..041af57f05 100644
--- a/toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/test_updateid2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_1/install.rdf
index 76e662977a..76e662977a 100644
--- a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_2/install.rdf
index e57672c423..e57672c423 100644
--- a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest
index 16108ce183..16108ce183 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json
index 2ca5f40f78..2ca5f40f78 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/webextension_2/install.rdf
index 653481ed02..653481ed02 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_2/manifest.json
index 5b470d430e..5b470d430e 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_2/manifest.json
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json b/toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/en/messages.json
index 36868d4147..36868d4147 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/en/messages.json
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json b/toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/fr/messages.json
index c3d02ffde9..c3d02ffde9 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/fr/messages.json
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_3/manifest.json
index b6ae6f10fe..b6ae6f10fe 100644
--- a/toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json
+++ b/toolkit/mozapps/webextensions/test/addons/webextension_3/manifest.json
diff --git a/toolkit/mozapps/extensions/test/browser/.eslintrc.js b/toolkit/mozapps/webextensions/test/browser/.eslintrc.js
index 2852eb81d1..2852eb81d1 100644
--- a/toolkit/mozapps/extensions/test/browser/.eslintrc.js
+++ b/toolkit/mozapps/webextensions/test/browser/.eslintrc.js
diff --git a/toolkit/mozapps/extensions/test/browser/addon_about.xul b/toolkit/mozapps/webextensions/test/browser/addon_about.xul
index c2b8b935ea..c2b8b935ea 100644
--- a/toolkit/mozapps/extensions/test/browser/addon_about.xul
+++ b/toolkit/mozapps/webextensions/test/browser/addon_about.xul
diff --git a/toolkit/mozapps/extensions/test/browser/addon_prefs.xul b/toolkit/mozapps/webextensions/test/browser/addon_prefs.xul
index 85cfe6b2d4..85cfe6b2d4 100644
--- a/toolkit/mozapps/extensions/test/browser/addon_prefs.xul
+++ b/toolkit/mozapps/webextensions/test/browser/addon_prefs.xul
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1.xpi
index d13e5d66ea..d13e5d66ea 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1/install.rdf
index 5199c2f3f6..5199c2f3f6 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10.xpi
index e1d6ac5869..e1d6ac5869 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10/install.rdf
index c061814b6f..c061814b6f 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2.xpi
index 1380e7b5b4..1380e7b5b4 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2/install.rdf
index 1be5422b23..1be5422b23 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3.xpi
index 46326b04c7..46326b04c7 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3/install.rdf
index 54887a30e7..54887a30e7 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4.xpi
index 95de79b791..95de79b791 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4/install.rdf
index 79946b0f01..79946b0f01 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5.xpi
index 005d7ef21e..005d7ef21e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5/install.rdf
index 067af1ba1b..067af1ba1b 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6.xpi
index 89f751a031..89f751a031 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6/install.rdf
index 37d7e6a7ca..37d7e6a7ca 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7.xpi
index 77de37c2a1..77de37c2a1 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7/install.rdf
index 461facbb2b..461facbb2b 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1.xpi
index 666ae09101..666ae09101 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1/install.rdf
index 2111b9c64d..2111b9c64d 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1.xpi
index ad9367dc1e..ad9367dc1e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1/install.rdf
index 032e9adaf7..032e9adaf7 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1.xpi
index 20ae355390..20ae355390 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1/install.rdf
index d9f0ca745a..d9f0ca745a 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2.xpi
index 3c99022cfb..3c99022cfb 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2/install.rdf
index 8809ffb589..8809ffb589 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1.xpi
index c438cbd0be..c438cbd0be 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1/install.rdf
index c768d7881e..c768d7881e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2.xpi
index a87191efed..a87191efed 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2/install.rdf
index bed489c3e9..bed489c3e9 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1.xpi
index d8b4d083ca..d8b4d083ca 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1/install.rdf
index 9bcd43e875..9bcd43e875 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2.xpi
index e4441cb19b..e4441cb19b 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2/install.rdf
index 4789abfaf0..4789abfaf0 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_experiment1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1.xpi
index 1c2b793f1e..1c2b793f1e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_experiment1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_experiment1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1/install.rdf
index 92f20a4ef3..92f20a4ef3 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_experiment1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1.xpi
index be453ce9c0..be453ce9c0 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/bootstrap.js
index 7871af738e..7871af738e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/chrome.manifest
index 8884e39745..8884e39745 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/install.rdf
index 18fcec167d..18fcec167d 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/options.xul
index cd4f723874..cd4f723874 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/options.xul
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/settings.dtd b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/settings.dtd
index 6864a3d5a7..6864a3d5a7 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/settings.dtd
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/settings.dtd
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom.xpi
index 6e937c5cc2..6e937c5cc2 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml
index 6ac72a03c9..6ac72a03c9 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js
index 7871af738e..7871af738e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest
index f1eaef1d09..f1eaef1d09 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf
index a04046a749..a04046a749 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/options.xul b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/options.xul
index 148fb9856f..148fb9856f 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/options.xul
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/options.xul
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd
index 0b2dcc8fe1..0b2dcc8fe1 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info.xpi
index 4c939c05b9..4c939c05b9 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js
index 7871af738e..7871af738e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/install.rdf
index ba90bd57b9..ba90bd57b9 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/options.xul b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/options.xul
index 095d3bcef2..095d3bcef2 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/options.xul
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/options.xul
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1.xpi
index d6df8f9d0e..d6df8f9d0e 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1/install.rdf
index b11b6d7e40..b11b6d7e40 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2.xpi
index 5468e6cb02..5468e6cb02 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2/install.rdf
index 81898b24d3..81898b24d3 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_installssl.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_installssl.xpi
index 999535a974..999535a974 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_installssl.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_installssl.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_installssl/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_installssl/install.rdf
index 7ce6cd09a4..7ce6cd09a4 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_installssl/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_installssl/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_searching.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching.xpi
index efef815aa2..efef815aa2 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_searching.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_searching/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching/bootstrap.js
index 7b86e419a3..7b86e419a3 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_searching/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_searching/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching/install.rdf
index 02cc935eaa..02cc935eaa 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_searching/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1.xpi
index 956812aaa7..956812aaa7 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/bootstrap.js
index ff5b80ae89..ff5b80ae89 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/chrome.manifest
index f1a7ccee15..f1a7ccee15 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/frame-script.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/frame-script.js
index f4674b840c..f4674b840c 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/frame-script.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/frame-script.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/install.rdf
index c52307b4a9..c52307b4a9 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2.xpi
index 7ef3db940c..7ef3db940c 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/bootstrap.js
index ff5b80ae89..ff5b80ae89 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/chrome.manifest
index f1a7ccee15..f1a7ccee15 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/chrome.manifest
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/chrome.manifest
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/frame-script.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/frame-script.js
index e35092a55b..e35092a55b 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/frame-script.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/frame-script.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/install.rdf
index 2fae190b4a..2fae190b4a 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install.xpi
index 4fa7b8bfac..4fa7b8bfac 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/bootstrap.js
index bd11077c2c..bd11077c2c 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/install.rdf
index 2cae124e14..2cae124e14 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/addons/options_signed.xpi b/toolkit/mozapps/webextensions/test/browser/addons/options_signed.xpi
index a063fd1c43..a063fd1c43 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/options_signed.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/addons/options_signed.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/addons/options_signed/manifest.json b/toolkit/mozapps/webextensions/test/browser/addons/options_signed/manifest.json
index e808cd5ab6..e808cd5ab6 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/options_signed/manifest.json
+++ b/toolkit/mozapps/webextensions/test/browser/addons/options_signed/manifest.json
diff --git a/toolkit/mozapps/extensions/test/browser/addons/options_signed/options.html b/toolkit/mozapps/webextensions/test/browser/addons/options_signed/options.html
index ea804601b5..ea804601b5 100644
--- a/toolkit/mozapps/extensions/test/browser/addons/options_signed/options.html
+++ b/toolkit/mozapps/webextensions/test/browser/addons/options_signed/options.html
diff --git a/toolkit/mozapps/extensions/test/browser/blockNoPlugins.xml b/toolkit/mozapps/webextensions/test/browser/blockNoPlugins.xml
index e4e191b370..e4e191b370 100644
--- a/toolkit/mozapps/extensions/test/browser/blockNoPlugins.xml
+++ b/toolkit/mozapps/webextensions/test/browser/blockNoPlugins.xml
diff --git a/toolkit/mozapps/extensions/test/browser/blockPluginHard.xml b/toolkit/mozapps/webextensions/test/browser/blockPluginHard.xml
index 24eb5bc6fc..24eb5bc6fc 100644
--- a/toolkit/mozapps/extensions/test/browser/blockPluginHard.xml
+++ b/toolkit/mozapps/webextensions/test/browser/blockPluginHard.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser-common.ini b/toolkit/mozapps/webextensions/test/browser/browser-common.ini
index eda266e2f3..eda266e2f3 100644
--- a/toolkit/mozapps/extensions/test/browser/browser-common.ini
+++ b/toolkit/mozapps/webextensions/test/browser/browser-common.ini
diff --git a/toolkit/mozapps/extensions/test/browser/browser-window.ini b/toolkit/mozapps/webextensions/test/browser/browser-window.ini
index fcda90fc68..fcda90fc68 100644
--- a/toolkit/mozapps/extensions/test/browser/browser-window.ini
+++ b/toolkit/mozapps/webextensions/test/browser/browser-window.ini
diff --git a/toolkit/mozapps/extensions/test/browser/browser.ini b/toolkit/mozapps/webextensions/test/browser/browser.ini
index a23841d332..a23841d332 100644
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/webextensions/test/browser/browser.ini
diff --git a/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js b/toolkit/mozapps/webextensions/test/browser/browser_CTP_plugins.js
index dd2992f810..dd2992f810 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_CTP_plugins.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_about.js b/toolkit/mozapps/webextensions/test/browser/browser_about.js
index f781cf146c..f781cf146c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_about.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_about.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js b/toolkit/mozapps/webextensions/test/browser/browser_addonrepository_performance.js
index 879d7331e8..879d7331e8 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_addonrepository_performance.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js b/toolkit/mozapps/webextensions/test/browser/browser_bug523784.js
index e61fafd6bd..e61fafd6bd 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug523784.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557943.js b/toolkit/mozapps/webextensions/test/browser/browser_bug557943.js
index 94a8b6f492..94a8b6f492 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557943.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug557943.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.js
index 136e7cb747..136e7cb747 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.rdf b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.rdf
index c72eb93630..c72eb93630 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.xml b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.xml
index c32ed30622..c32ed30622 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956_8_2.xpi b/toolkit/mozapps/webextensions/test/browser/browser_bug557956_8_2.xpi
index e99f3c3bd1..e99f3c3bd1 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956_8_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug557956_8_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956_9_2.xpi b/toolkit/mozapps/webextensions/test/browser/browser_bug557956_9_2.xpi
index 23686b6081..23686b6081 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug557956_9_2.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug557956_9_2.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562797.js
index 55e882a057..55e882a057 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug562797.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562854.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562854.js
index 53e890b71e..53e890b71e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562854.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug562854.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562890.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562890.js
index ccb12c4898..ccb12c4898 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562890.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug562890.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562899.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562899.js
index 9807be98f8..9807be98f8 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562899.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug562899.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562992.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562992.js
index 1cd4d90cda..1cd4d90cda 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562992.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug562992.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug567127.js b/toolkit/mozapps/webextensions/test/browser/browser_bug567127.js
index 1d9a754167..1d9a754167 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug567127.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug567127.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug567137.js b/toolkit/mozapps/webextensions/test/browser/browser_bug567137.js
index bb9b9a8945..bb9b9a8945 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug567137.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug567137.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug570760.js b/toolkit/mozapps/webextensions/test/browser/browser_bug570760.js
index 0606a9a310..0606a9a310 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug570760.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug570760.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug572561.js b/toolkit/mozapps/webextensions/test/browser/browser_bug572561.js
index 69102060e3..69102060e3 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug572561.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug572561.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug573062.js b/toolkit/mozapps/webextensions/test/browser/browser_bug573062.js
index 6554451fbe..6554451fbe 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug573062.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug573062.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug577990.js b/toolkit/mozapps/webextensions/test/browser/browser_bug577990.js
index 913b3b9548..913b3b9548 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug577990.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug577990.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug580298.js b/toolkit/mozapps/webextensions/test/browser/browser_bug580298.js
index d3d338203a..d3d338203a 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug580298.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug580298.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug581076.js b/toolkit/mozapps/webextensions/test/browser/browser_bug581076.js
index b02a6cc3e8..b02a6cc3e8 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug581076.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug581076.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug586574.js b/toolkit/mozapps/webextensions/test/browser/browser_bug586574.js
index fb5ebf01bf..fb5ebf01bf 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug586574.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug586574.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js b/toolkit/mozapps/webextensions/test/browser/browser_bug587970.js
index ef05ba4ea5..ef05ba4ea5 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug587970.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug590347.js b/toolkit/mozapps/webextensions/test/browser/browser_bug590347.js
index f805f0e199..f805f0e199 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug590347.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug590347.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js b/toolkit/mozapps/webextensions/test/browser/browser_bug591465.js
index f759ffc1fb..f759ffc1fb 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug591465.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591465.xml b/toolkit/mozapps/webextensions/test/browser/browser_bug591465.xml
index 9c2e102e72..9c2e102e72 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591465.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug591465.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js b/toolkit/mozapps/webextensions/test/browser/browser_bug591663.js
index 4a4f735af2..4a4f735af2 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug591663.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug593535.js b/toolkit/mozapps/webextensions/test/browser/browser_bug593535.js
index fd23d00361..fd23d00361 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug593535.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug593535.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug593535.xml b/toolkit/mozapps/webextensions/test/browser/browser_bug593535.xml
index 411d9f3830..411d9f3830 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug593535.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug593535.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug596336.js b/toolkit/mozapps/webextensions/test/browser/browser_bug596336.js
index ec32e376ff..ec32e376ff 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug596336.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug596336.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug608316.js b/toolkit/mozapps/webextensions/test/browser/browser_bug608316.js
index 72bb61f497..72bb61f497 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug608316.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug608316.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug610764.js b/toolkit/mozapps/webextensions/test/browser/browser_bug610764.js
index 58de881304..58de881304 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug610764.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug610764.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug616841.js b/toolkit/mozapps/webextensions/test/browser/browser_bug616841.js
index 3cf6f5346c..3cf6f5346c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug616841.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug616841.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug618502.js b/toolkit/mozapps/webextensions/test/browser/browser_bug618502.js
index 5bcc6baf1e..5bcc6baf1e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug618502.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug618502.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug679604.js b/toolkit/mozapps/webextensions/test/browser/browser_bug679604.js
index e1ec605c28..e1ec605c28 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug679604.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug679604.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug714593.js b/toolkit/mozapps/webextensions/test/browser/browser_bug714593.js
index b9a7faa5e4..b9a7faa5e4 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug714593.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_bug714593.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_cancelCompatCheck.js b/toolkit/mozapps/webextensions/test/browser/browser_cancelCompatCheck.js
index e7c6722120..e7c6722120 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_cancelCompatCheck.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_cancelCompatCheck.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_checkAddonCompatibility.js b/toolkit/mozapps/webextensions/test/browser/browser_checkAddonCompatibility.js
index 6c42e0126e..6c42e0126e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_checkAddonCompatibility.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_checkAddonCompatibility.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/webextensions/test/browser/browser_details.js
index ce4c51b5aa..ce4c51b5aa 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_details.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_discovery.js b/toolkit/mozapps/webextensions/test/browser/browser_discovery.js
index ec336df2dc..ec336df2dc 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_discovery.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_discovery_install.js b/toolkit/mozapps/webextensions/test/browser/browser_discovery_install.js
index 63516bd53b..63516bd53b 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery_install.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_discovery_install.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js b/toolkit/mozapps/webextensions/test/browser/browser_dragdrop.js
index 960e7e9339..960e7e9339 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_dragdrop.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_eula.js b/toolkit/mozapps/webextensions/test/browser/browser_eula.js
index befe9f1f25..befe9f1f25 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_eula.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_eula.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_eula.xml b/toolkit/mozapps/webextensions/test/browser/browser_eula.xml
index 965ab8a0bd..965ab8a0bd 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_eula.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_eula.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_experiments.js b/toolkit/mozapps/webextensions/test/browser/browser_experiments.js
index 18a548de55..18a548de55 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_experiments.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_experiments.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js b/toolkit/mozapps/webextensions/test/browser/browser_globalwarnings.js
index 663905a90f..663905a90f 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_globalwarnings.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/webextensions/test/browser/browser_gmpProvider.js
index 52079a2632..52079a2632 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_gmpProvider.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_hotfix.js b/toolkit/mozapps/webextensions/test/browser/browser_hotfix.js
index b7bb3f5803..b7bb3f5803 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_hotfix.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_hotfix.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings.js
index e2814ddf4c..e2814ddf4c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_browser.js
index 5a704530a1..5a704530a1 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_browser.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_custom.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_custom.js
index ecd10852d4..ecd10852d4 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_custom.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_custom.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_info.js
index ce618b7fa7..ce618b7fa7 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_info.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.js b/toolkit/mozapps/webextensions/test/browser/browser_install.js
index 880a4624d9..880a4624d9 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_install.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_install.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.rdf b/toolkit/mozapps/webextensions/test/browser/browser_install.rdf
index 437bf9b85e..437bf9b85e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_install.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/browser_install.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.rdf^headers^ b/toolkit/mozapps/webextensions/test/browser/browser_install.rdf^headers^
index 2e4f8163bb..2e4f8163bb 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_install.rdf^headers^
+++ b/toolkit/mozapps/webextensions/test/browser/browser_install.rdf^headers^
diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.xml b/toolkit/mozapps/webextensions/test/browser/browser_install.xml
index 0643c811ab..0643c811ab 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_install.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_install.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_install1_3.xpi b/toolkit/mozapps/webextensions/test/browser/browser_install1_3.xpi
index de3c90353e..de3c90353e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_install1_3.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/browser_install1_3.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/browser_installssl.js b/toolkit/mozapps/webextensions/test/browser/browser_installssl.js
index b0726ef9ee..b0726ef9ee 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_installssl.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_installssl.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/webextensions/test/browser/browser_list.js
index 49427329fd..49427329fd 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_list.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js b/toolkit/mozapps/webextensions/test/browser/browser_manualupdates.js
index 0c5eb2da63..0c5eb2da63 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_manualupdates.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_metadataTimeout.js b/toolkit/mozapps/webextensions/test/browser/browser_metadataTimeout.js
index 98be4b7f82..98be4b7f82 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_metadataTimeout.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_metadataTimeout.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_newaddon.js b/toolkit/mozapps/webextensions/test/browser/browser_newaddon.js
index d450828baa..d450828baa 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_newaddon.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_newaddon.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_openDialog.js b/toolkit/mozapps/webextensions/test/browser/browser_openDialog.js
index f95365a4c0..f95365a4c0 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_openDialog.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_openDialog.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js b/toolkit/mozapps/webextensions/test/browser/browser_plugin_enabled_state_locked.js
index a9c7be4bc0..a9c7be4bc0 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_plugin_enabled_state_locked.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js b/toolkit/mozapps/webextensions/test/browser/browser_pluginprefs.js
index 458e8e3340..458e8e3340 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_pluginprefs.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_purchase.js b/toolkit/mozapps/webextensions/test/browser/browser_purchase.js
index a815d10d5a..a815d10d5a 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_purchase.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_purchase.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_purchase.xml b/toolkit/mozapps/webextensions/test/browser/browser_purchase.xml
index 9d4b18880b..9d4b18880b 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_purchase.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_purchase.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js b/toolkit/mozapps/webextensions/test/browser/browser_recentupdates.js
index 02007dbbf1..02007dbbf1 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_recentupdates.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.js b/toolkit/mozapps/webextensions/test/browser/browser_searching.js
index 907d9b1058..907d9b1058 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_searching.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_searching.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.xml b/toolkit/mozapps/webextensions/test/browser/browser_searching.xml
index a3537b269a..a3537b269a 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_searching.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_searching.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching_empty.xml b/toolkit/mozapps/webextensions/test/browser/browser_searching_empty.xml
index 24f6cb89f3..24f6cb89f3 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_searching_empty.xml
+++ b/toolkit/mozapps/webextensions/test/browser/browser_searching_empty.xml
diff --git a/toolkit/mozapps/extensions/test/browser/browser_sorting.js b/toolkit/mozapps/webextensions/test/browser/browser_sorting.js
index b57e7a6f75..b57e7a6f75 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_sorting.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_sorting.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js b/toolkit/mozapps/webextensions/test/browser/browser_sorting_plugins.js
index 2bb6b4ba48..2bb6b4ba48 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_sorting_plugins.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_system_addons_are_e10s.js b/toolkit/mozapps/webextensions/test/browser/browser_system_addons_are_e10s.js
index 37ab76542c..37ab76542c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_system_addons_are_e10s.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_system_addons_are_e10s.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_tabsettings.js b/toolkit/mozapps/webextensions/test/browser/browser_tabsettings.js
index 2838698c7e..2838698c7e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_tabsettings.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_tabsettings.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_task_next_test.js b/toolkit/mozapps/webextensions/test/browser/browser_task_next_test.js
index 5ff2aff78e..5ff2aff78e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_task_next_test.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_task_next_test.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_types.js b/toolkit/mozapps/webextensions/test/browser/browser_types.js
index 8abb0ff73d..8abb0ff73d 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_types.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_types.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js b/toolkit/mozapps/webextensions/test/browser/browser_uninstalling.js
index a9329e496e..a9329e496e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_uninstalling.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_update.js b/toolkit/mozapps/webextensions/test/browser/browser_update.js
index 09ceb12404..09ceb12404 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_update.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_update.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_updateid.js b/toolkit/mozapps/webextensions/test/browser/browser_updateid.js
index 0fe3eeec5b..0fe3eeec5b 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_updateid.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_updateid.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.js b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.js
index 8b816c927f..8b816c927f 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_updatessl.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf
index f24573847d..f24573847d 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf^headers^ b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf^headers^
index 2e4f8163bb..2e4f8163bb 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf^headers^
+++ b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf^headers^
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi.js
index ca8e41aad0..ca8e41aad0 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webapi.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_access.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_access.js
index f4b1dc7459..f4b1dc7459 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi_access.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webapi_access.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_addon_listener.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_addon_listener.js
index b8049f13cd..b8049f13cd 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi_addon_listener.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webapi_addon_listener.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_enable.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_enable.js
index 27d8029c55..27d8029c55 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi_enable.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webapi_enable.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_install.js
index bc31c23315..bc31c23315 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webapi_install.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_uninstall.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_uninstall.js
index 724f6fefe4..724f6fefe4 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi_uninstall.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webapi_uninstall.js
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webext_options.js b/toolkit/mozapps/webextensions/test/browser/browser_webext_options.js
index b13213f0b5..b13213f0b5 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webext_options.js
+++ b/toolkit/mozapps/webextensions/test/browser/browser_webext_options.js
diff --git a/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs b/toolkit/mozapps/webextensions/test/browser/cancelCompatCheck.sjs
index 38bc25d08e..38bc25d08e 100644
--- a/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs
+++ b/toolkit/mozapps/webextensions/test/browser/cancelCompatCheck.sjs
diff --git a/toolkit/mozapps/extensions/test/browser/discovery.html b/toolkit/mozapps/webextensions/test/browser/discovery.html
index 72f4fe3747..72f4fe3747 100644
--- a/toolkit/mozapps/extensions/test/browser/discovery.html
+++ b/toolkit/mozapps/webextensions/test/browser/discovery.html
diff --git a/toolkit/mozapps/extensions/test/browser/discovery_frame.html b/toolkit/mozapps/webextensions/test/browser/discovery_frame.html
index 8ec722812e..8ec722812e 100644
--- a/toolkit/mozapps/extensions/test/browser/discovery_frame.html
+++ b/toolkit/mozapps/webextensions/test/browser/discovery_frame.html
diff --git a/toolkit/mozapps/extensions/test/browser/discovery_install.html b/toolkit/mozapps/webextensions/test/browser/discovery_install.html
index c6499ec035..c6499ec035 100644
--- a/toolkit/mozapps/extensions/test/browser/discovery_install.html
+++ b/toolkit/mozapps/webextensions/test/browser/discovery_install.html
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/webextensions/test/browser/head.js
index 5a749099d5..5a749099d5 100644
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/webextensions/test/browser/head.js
diff --git a/toolkit/mozapps/extensions/test/browser/more_options.xul b/toolkit/mozapps/webextensions/test/browser/more_options.xul
index 28dbb0a2e0..28dbb0a2e0 100644
--- a/toolkit/mozapps/extensions/test/browser/more_options.xul
+++ b/toolkit/mozapps/webextensions/test/browser/more_options.xul
diff --git a/toolkit/mozapps/extensions/test/browser/moz.build b/toolkit/mozapps/webextensions/test/browser/moz.build
index af04aaeef8..af04aaeef8 100644
--- a/toolkit/mozapps/extensions/test/browser/moz.build
+++ b/toolkit/mozapps/webextensions/test/browser/moz.build
diff --git a/toolkit/mozapps/extensions/test/browser/options.xul b/toolkit/mozapps/webextensions/test/browser/options.xul
index 1b68279153..1b68279153 100644
--- a/toolkit/mozapps/extensions/test/browser/options.xul
+++ b/toolkit/mozapps/webextensions/test/browser/options.xul
diff --git a/toolkit/mozapps/extensions/test/browser/plugin_test.html b/toolkit/mozapps/webextensions/test/browser/plugin_test.html
index 0709eda066..0709eda066 100644
--- a/toolkit/mozapps/extensions/test/browser/plugin_test.html
+++ b/toolkit/mozapps/webextensions/test/browser/plugin_test.html
diff --git a/toolkit/mozapps/extensions/test/browser/redirect.sjs b/toolkit/mozapps/webextensions/test/browser/redirect.sjs
index 8f9d1c08af..8f9d1c08af 100644
--- a/toolkit/mozapps/extensions/test/browser/redirect.sjs
+++ b/toolkit/mozapps/webextensions/test/browser/redirect.sjs
diff --git a/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml b/toolkit/mozapps/webextensions/test/browser/releaseNotes.xhtml
index 63ae07901c..63ae07901c 100644
--- a/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml
+++ b/toolkit/mozapps/webextensions/test/browser/releaseNotes.xhtml
diff --git a/toolkit/mozapps/extensions/test/browser/signed_hotfix.rdf b/toolkit/mozapps/webextensions/test/browser/signed_hotfix.rdf
index 39bd936c92..39bd936c92 100644
--- a/toolkit/mozapps/extensions/test/browser/signed_hotfix.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/signed_hotfix.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/signed_hotfix.xpi b/toolkit/mozapps/webextensions/test/browser/signed_hotfix.xpi
index bd18905738..bd18905738 100644
--- a/toolkit/mozapps/extensions/test/browser/signed_hotfix.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/signed_hotfix.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/unsigned_hotfix.rdf b/toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.rdf
index 2b4ba9362b..2b4ba9362b 100644
--- a/toolkit/mozapps/extensions/test/browser/unsigned_hotfix.rdf
+++ b/toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.rdf
diff --git a/toolkit/mozapps/extensions/test/browser/unsigned_hotfix.xpi b/toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.xpi
index f2d475bd23..f2d475bd23 100644
--- a/toolkit/mozapps/extensions/test/browser/unsigned_hotfix.xpi
+++ b/toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.xpi
diff --git a/toolkit/mozapps/extensions/test/browser/webapi_addon_listener.html b/toolkit/mozapps/webextensions/test/browser/webapi_addon_listener.html
index 56128fd9c7..56128fd9c7 100644
--- a/toolkit/mozapps/extensions/test/browser/webapi_addon_listener.html
+++ b/toolkit/mozapps/webextensions/test/browser/webapi_addon_listener.html
diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checkavailable.html b/toolkit/mozapps/webextensions/test/browser/webapi_checkavailable.html
index 141f09cc61..141f09cc61 100644
--- a/toolkit/mozapps/extensions/test/browser/webapi_checkavailable.html
+++ b/toolkit/mozapps/webextensions/test/browser/webapi_checkavailable.html
diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checkchromeframe.xul b/toolkit/mozapps/webextensions/test/browser/webapi_checkchromeframe.xul
index 76e642604f..76e642604f 100644
--- a/toolkit/mozapps/extensions/test/browser/webapi_checkchromeframe.xul
+++ b/toolkit/mozapps/webextensions/test/browser/webapi_checkchromeframe.xul
diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checkframed.html b/toolkit/mozapps/webextensions/test/browser/webapi_checkframed.html
index 1467699789..1467699789 100644
--- a/toolkit/mozapps/extensions/test/browser/webapi_checkframed.html
+++ b/toolkit/mozapps/webextensions/test/browser/webapi_checkframed.html
diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checknavigatedwindow.html b/toolkit/mozapps/webextensions/test/browser/webapi_checknavigatedwindow.html
index ba36533109..ba36533109 100644
--- a/toolkit/mozapps/extensions/test/browser/webapi_checknavigatedwindow.html
+++ b/toolkit/mozapps/webextensions/test/browser/webapi_checknavigatedwindow.html
diff --git a/toolkit/mozapps/extensions/test/mochitest/.eslintrc.js b/toolkit/mozapps/webextensions/test/mochitest/.eslintrc.js
index 383da0f41e..383da0f41e 100644
--- a/toolkit/mozapps/extensions/test/mochitest/.eslintrc.js
+++ b/toolkit/mozapps/webextensions/test/mochitest/.eslintrc.js
diff --git a/toolkit/mozapps/extensions/test/mochitest/file_bug687194.xpi b/toolkit/mozapps/webextensions/test/mochitest/file_bug687194.xpi
index e215cffad8..e215cffad8 100644
--- a/toolkit/mozapps/extensions/test/mochitest/file_bug687194.xpi
+++ b/toolkit/mozapps/webextensions/test/mochitest/file_bug687194.xpi
diff --git a/toolkit/mozapps/extensions/test/mochitest/file_empty.html b/toolkit/mozapps/webextensions/test/mochitest/file_empty.html
index b6c8a53b41..b6c8a53b41 100644
--- a/toolkit/mozapps/extensions/test/mochitest/file_empty.html
+++ b/toolkit/mozapps/webextensions/test/mochitest/file_empty.html
diff --git a/toolkit/mozapps/extensions/test/mochitest/mochitest.ini b/toolkit/mozapps/webextensions/test/mochitest/mochitest.ini
index b14cfe87a1..b14cfe87a1 100644
--- a/toolkit/mozapps/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/mozapps/webextensions/test/mochitest/mochitest.ini
diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug609794.html b/toolkit/mozapps/webextensions/test/mochitest/test_bug609794.html
index d13e6ef2f2..d13e6ef2f2 100644
--- a/toolkit/mozapps/extensions/test/mochitest/test_bug609794.html
+++ b/toolkit/mozapps/webextensions/test/mochitest/test_bug609794.html
diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug687194.html b/toolkit/mozapps/webextensions/test/mochitest/test_bug687194.html
index 8f99ea73a2..8f99ea73a2 100644
--- a/toolkit/mozapps/extensions/test/mochitest/test_bug687194.html
+++ b/toolkit/mozapps/webextensions/test/mochitest/test_bug687194.html
diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html b/toolkit/mozapps/webextensions/test/mochitest/test_bug887098.html
index 535799b273..535799b273 100644
--- a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
+++ b/toolkit/mozapps/webextensions/test/mochitest/test_bug887098.html
diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/webextensions/test/moz.build
index 716659198a..716659198a 100644
--- a/toolkit/mozapps/extensions/test/moz.build
+++ b/toolkit/mozapps/webextensions/test/moz.build
diff --git a/toolkit/mozapps/extensions/test/xpcshell/.eslintrc.js b/toolkit/mozapps/webextensions/test/xpcshell/.eslintrc.js
index ba65517f95..ba65517f95 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/.eslintrc.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/.eslintrc.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/BootstrapMonitor.jsm b/toolkit/mozapps/webextensions/test/xpcshell/data/BootstrapMonitor.jsm
index 7c1e4aa9d6..7c1e4aa9d6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/BootstrapMonitor.jsm
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/BootstrapMonitor.jsm
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_change.xml
index a229a653a1..a229a653a1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_change.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
index 5882909684..5882909684 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update1.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
index 5c3747f5f4..5c3747f5f4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update2.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
index d607084142..d607084142 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update3.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/app_update.xml
index 85a66fe555..85a66fe555 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/app_update.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml
index 87011cd398..87011cd398 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml
index 867a34255b..867a34255b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/manual_update.xml
index df9276525b..df9276525b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/manual_update.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_block.xml
index 1f673ef2fb..1f673ef2fb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_block.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_empty.xml
index 88d22f281f..88d22f281f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_empty.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_empty.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_start.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_start.xml
index daba6f4c1c..daba6f4c1c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_start.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_start.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_warn.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_warn.xml
index 232fd0d079..232fd0d079 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_warn.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_warn.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/corrupt.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/corrupt.xpi
index 35d7bd5e5d..35d7bd5e5d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/corrupt.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/corrupt.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/corruptfile.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/corruptfile.xpi
index 0c30989aa5..0c30989aa5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/corruptfile.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/corruptfile.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/empty.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/empty.xpi
index 74ed2b8174..74ed2b8174 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/empty.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/empty.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/from_sources/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/from_sources/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/from_sources/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/install.rdf
index f02a3869c3..f02a3869c3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/from_sources/install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/pluginInfoURL_block.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/pluginInfoURL_block.xml
index 75e252a46b..75e252a46b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/pluginInfoURL_block.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/pluginInfoURL_block.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.txt
index f17f98b15b..f17f98b15b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.xml
index 0e3d415c44..0e3d415c44 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad2.xml
index 55ad1c7d55..55ad1c7d55 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad2.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad2.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/empty.xml
index 42cb20bd01..42cb20bd01 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/empty.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/empty.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/good.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/good.xml
index e1da86fa54..e1da86fa54 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/good.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/good.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/missing.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/missing.xml
index 8c9501478e..8c9501478e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/missing.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/missing.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/unsigned.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/unsigned.xpi
index 51b00475a9..51b00475a9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/unsigned.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/unsigned.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js
index 0cf01d319f..0cf01d319f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf
index 9d08c357cf..9d08c357cf 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt
index 11686f61ce..11686f61ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js
index 718c82be45..718c82be45 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf
index 0a345dd92b..0a345dd92b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt
index 11686f61ce..11686f61ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi
index 9d6f0c7081..9d6f0c7081 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi
index 4496a90cf8..4496a90cf8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_good.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_good.xpi
index e61e3c721b..e61e3c721b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_good.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_good.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_hash.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_hash.xpi
index 1682a75068..1682a75068 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_hash.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_hash.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_plain.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_plain.xpi
index cd67e25fcf..cd67e25fcf 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_plain.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_plain.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_hash.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_hash.xpi
index e4040a274e..e4040a274e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_hash.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_hash.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_plain.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_plain.xpi
index ca453b9d5e..ca453b9d5e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_plain.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_plain.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_65_hash.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_65_hash.xpi
index 69579d2dca..69579d2dca 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_65_hash.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_65_hash.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_badid.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_badid.xpi
index 6e23eb214c..6e23eb214c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_badid.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_badid.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_broken.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_broken.xpi
index 0ba0f30d1a..0ba0f30d1a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_broken.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_broken.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_signed.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_signed.xpi
index 33101f63c0..33101f63c0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_signed.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_signed.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi
index 3146870d86..3146870d86 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf
index 97ae609888..97ae609888 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt
index 11686f61ce..11686f61ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf
index df2fd80812..df2fd80812 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt
index 11686f61ce..11686f61ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi
index ec38fcc651..ec38fcc651 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi
index fc28423997..fc28423997 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi
index 327c8a1875..327c8a1875 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi
index efad21d1b6..efad21d1b6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi
index d6ddbcec38..d6ddbcec38 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi
index 5898d83e49..5898d83e49 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi
index 9d50f08250..9d50f08250 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi
index 6ba1efd727..6ba1efd727 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1.xpi
index 2fc2fd1892..2fc2fd1892 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi
index e7e50c8ea8..e7e50c8ea8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_2.xpi
index a858cf74a9..a858cf74a9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_1.xpi
index 911632e49f..911632e49f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_2.xpi
index 102a053bbd..102a053bbd 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_3.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_3.xpi
index 295e77611f..295e77611f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_3.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_3.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_1.xpi
index 954995619b..954995619b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_2.xpi
index dc8632aefe..dc8632aefe 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_3.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_3.xpi
index 3f818172a3..3f818172a3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_3.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_3.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system4_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system4_1.xpi
index 1f70b1a757..1f70b1a757 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system4_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system4_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system5_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system5_1.xpi
index fc636e97ff..fc636e97ff 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system5_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system5_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi
index ff620966d2..ff620966d2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi
index e474dbd59a..e474dbd59a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi
index 1ccde90c5f..1ccde90c5f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete.xpi
index 94d9e47d26..94d9e47d26 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi
index 28c8561c62..28c8561c62 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer.xpi
index daf55c0d4c..daf55c0d4c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi
index 75cacbbc87..75cacbbc87 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi
index 2eb6b7fc96..2eb6b7fc96 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi
index fb588b3e04..fb588b3e04 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi
index 7a5eb265d3..7a5eb265d3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi
index dc67493550..dc67493550 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_failed_update.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_failed_update.xpi
index 3c673ac2e4..3c673ac2e4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_failed_update.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_failed_update.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository.xml
index 0bebca2c1a..0bebca2c1a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_cache.xml
index f707f1217d..f707f1217d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_cache.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml
index 0030957272..0030957272 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml
index fec8b09ca3..fec8b09ca3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml
index f99256b87d..f99256b87d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_empty.xml
index 4cd5c14433..4cd5c14433 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_empty.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_empty.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_failed.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_failed.xml
index d02fa02495..d02fa02495 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_failed.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_failed.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml
index 8a61679695..8a61679695 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_backgroundupdate.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_backgroundupdate.rdf
index ab7cdef340..ab7cdef340 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_backgroundupdate.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_backgroundupdate.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml
index 368a6ed53f..368a6ed53f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_prefs_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_prefs_1.xml
index 41df457b05..41df457b05 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_prefs_1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_prefs_1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_regexp_1.xml
index 20035c6a2e..20035c6a2e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_regexp_1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716.rdf
index d60d8ca3f7..d60d8ca3f7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716_2.rdf
index 94a4ea450e..94a4ea450e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716_2.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716_2.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug324121.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug324121.rdf
index 2c453f7565..2c453f7565 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug324121.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug324121.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug393285.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug393285.xml
index 1767b4332f..1767b4332f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug393285.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug393285.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug394300.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug394300.rdf
index 94e12527f6..94e12527f6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug394300.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug394300.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug424262.xml
index d797debbb9..d797debbb9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug424262.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_app.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_app.xml
index f12ca1fa6d..f12ca1fa6d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_app.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_app.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_toolkit.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_toolkit.xml
index ad8ec5ed9d..ad8ec5ed9d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_toolkit.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_toolkit.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug468528.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug468528.xml
index 85f0da57ce..85f0da57ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug468528.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug468528.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_1.rdf
index 5397e8a872..5397e8a872 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_1.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_1.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_2.rdf
index b1dde7f7ae..b1dde7f7ae 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_2.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_2.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_3.rdf
index ae483434a6..ae483434a6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_3.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_3.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_4.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_4.rdf
index 97abacc5e1..97abacc5e1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_4.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_4.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_5.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_5.rdf
index bff1104a76..bff1104a76 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_5.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_5.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_1.rdf
index e4ad91ae9f..e4ad91ae9f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_1.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_1.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_2.rdf
index 10fcafd391..10fcafd391 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_2.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_2.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_3.rdf
index 6840024622..6840024622 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_3.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_3.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_4.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_4.rdf
index 6e71162397..6e71162397 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_4.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_4.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_5.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_5.rdf
index c926af934f..c926af934f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_5.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_5.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_1.xml
index c4cc2fe37a..c4cc2fe37a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_2.xml
index cc0a0c69df..cc0a0c69df 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_2.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_2.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_empty.xml
index 0261794f8a..0261794f8a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_empty.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_empty.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml
index d651f87996..d651f87996 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml
index 208444681e..208444681e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_1.xpi
index 2dbcc0b50f..2dbcc0b50f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_1.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_1.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_2.xpi
index 86fc6baaa9..86fc6baaa9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug541420.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug541420.xpi
index adb7be9adf..adb7be9adf 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug541420.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug541420.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug542391.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug542391.rdf
index db82cf6750..db82cf6750 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug542391.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug542391.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug554133.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug554133.xml
index 736c105140..736c105140 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug554133.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug554133.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug619730.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug619730.xml
index f2511c0de6..f2511c0de6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug619730.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug619730.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug655254.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug655254.rdf
index 9857dcb555..9857dcb555 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug655254.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug655254.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_compatoverrides.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_compatoverrides.xml
index c0d67d0334..c0d67d0334 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_compatoverrides.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_compatoverrides.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_corrupt.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_corrupt.rdf
index f3341bdcfb..f3341bdcfb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_corrupt.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_corrupt.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js
index a81c90bf00..a81c90bf00 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js
index 25ffd85657..25ffd85657 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js
index 7693c9c2de..7693c9c2de 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.json
index cf3defdc75..cf3defdc75 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.json
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.json
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.rdf
index 8af39cb0e7..8af39cb0e7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.json
index 2fcab10b5f..2fcab10b5f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.json
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.json
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.rdf
index d44d4880f1..d44d4880f1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.json
index b7f48149d7..b7f48149d7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.json
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.json
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.rdf
index 866884f8d5..866884f8d5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_dictionary.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_dictionary.rdf
index 364b3bba1a..364b3bba1a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_dictionary.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_dictionary.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/bootstrap.js
index 01682d3b7e..01682d3b7e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/install.rdf
index ebe547cccb..ebe547cccb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt
index 051aef85a9..051aef85a9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt
index 9eddc4493b..9eddc4493b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist.xml
index d535d2c3f4..d535d2c3f4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist2.xml
index 0ad8f6819e..0ad8f6819e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist2.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml
index f646763550..f646763550 100755..100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml
index 248868a2e7..248868a2e7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_1.rdf
index 0167260213..0167260213 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_1.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_1.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_2.rdf
index 35a2befee1..35a2befee1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_2.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_2.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_3.rdf
index 7180da143e..7180da143e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_3.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_3.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_install.rdf
index fe82334fa9..fe82334fa9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_install.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_install.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_install.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_install.xml
index 33f14a2fdc..33f14a2fdc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_install.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_install.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_migrate.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate.rdf
index d1dc992d58..d1dc992d58 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_migrate.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_migrate4.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate4.rdf
index a3bf4f8aea..a3bf4f8aea 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_migrate4.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate4.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_no_update.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_no_update.json
index 2773c7f98f..2773c7f98f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_no_update.json
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_no_update.json
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/ancient.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/ancient.xml
index 699257f87e..699257f87e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/ancient.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/ancient.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/new.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/new.xml
index 8cbfb5d6a0..8cbfb5d6a0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/new.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/new.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/old.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/old.xml
index 75bd6e934c..75bd6e934c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/old.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/old.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtp.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtp.xml
index d3564aebdb..d3564aebdb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtp.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtp.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml
index 7cd8496b36..7cd8496b36 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_proxy/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_proxy/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_proxy/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_proxy/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_softblocked1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_softblocked1.xml
index a1d18470c8..a1d18470c8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_softblocked1.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_softblocked1.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_sourceURI.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_sourceURI.xml
index 949288e3f1..949288e3f1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_sourceURI.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_sourceURI.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_temporary/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_temporary/bootstrap.js
index 1666f2972c..1666f2972c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_temporary/bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_temporary/bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.json
index 027a9b2333..027a9b2333 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.json
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.json
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.rdf
index 4d4640f605..4d4640f605 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.xml
index 62928815b7..62928815b7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.xml
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update_multi.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update_multi.rdf
index f28a3f26dc..f28a3f26dc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_update_multi.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update_multi.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.json
index 811e50158e..811e50158e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.json
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.json
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.rdf
index c5d97ada0d..c5d97ada0d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf
index ec6e88ec48..ec6e88ec48 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_normal.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_normal.rdf
index 2ef88860ec..2ef88860ec 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_normal.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_normal.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_strict.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_strict.rdf
index 2f72c181d9..2f72c181d9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_strict.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_strict.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updateid.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updateid.rdf
index c13928520d..c13928520d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/test_updateid.rdf
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updateid.rdf
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/unsigned.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/unsigned.xpi
index 51b00475a9..51b00475a9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/unsigned.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/unsigned.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/webext-implicit-id.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/webext-implicit-id.xpi
index 6b4abaa691..6b4abaa691 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/webext-implicit-id.xpi
+++ b/toolkit/mozapps/webextensions/test/xpcshell/data/webext-implicit-id.xpi
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
index 960caceeb4..960caceeb4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js b/toolkit/mozapps/webextensions/test/xpcshell/head_unpack.js
index 6310bbc601..6310bbc601 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/head_unpack.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository.js
index dd0dc1981d..dd0dc1981d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_cache.js
index 2032359404..2032359404 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_cache.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_compatmode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_compatmode.js
index 6aec96ea12..6aec96ea12 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_compatmode.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_compatmode.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ChromeManifestParser.js b/toolkit/mozapps/webextensions/test/xpcshell/test_ChromeManifestParser.js
index 605c4224b3..605c4224b3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_ChromeManifestParser.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_ChromeManifestParser.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js b/toolkit/mozapps/webextensions/test/xpcshell/test_DeferredSave.js
index 2a6ff291e4..2a6ff291e4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_DeferredSave.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js b/toolkit/mozapps/webextensions/test/xpcshell/test_LightweightThemeManager.js
index 61a46b2510..61a46b2510 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_LightweightThemeManager.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js b/toolkit/mozapps/webextensions/test/xpcshell/test_ProductAddonChecker.js
index 6c562db659..6c562db659 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_ProductAddonChecker.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_XPIStates.js b/toolkit/mozapps/webextensions/test/xpcshell/test_XPIStates.js
index 99ab8ab131..99ab8ab131 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_XPIStates.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_XPIStates.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_XPIcancel.js b/toolkit/mozapps/webextensions/test/xpcshell/test_XPIcancel.js
index d733778a5b..d733778a5b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_XPIcancel.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_XPIcancel.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_addon_path_service.js b/toolkit/mozapps/webextensions/test/xpcshell/test_addon_path_service.js
index 56ce3c614b..56ce3c614b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_addon_path_service.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_addon_path_service.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_asyncBlocklistLoad.js b/toolkit/mozapps/webextensions/test/xpcshell/test_asyncBlocklistLoad.js
index 38e563979b..38e563979b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_asyncBlocklistLoad.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_asyncBlocklistLoad.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js b/toolkit/mozapps/webextensions/test/xpcshell/test_backgroundupdate.js
index 3890b76e19..3890b76e19 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_backgroundupdate.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bad_json.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bad_json.js
index d3ccf68f3a..d3ccf68f3a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bad_json.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bad_json.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_badschema.js b/toolkit/mozapps/webextensions/test/xpcshell/test_badschema.js
index 6ebf088d6f..6ebf088d6f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_badschema.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_badschema.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_gfx.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_gfx.js
index cbcd5cb7e2..cbcd5cb7e2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_gfx.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_gfx.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_metadata_filters.js
index 5befa6fa05..5befa6fa05 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_metadata_filters.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_prefs.js
index 41ef62f988..41ef62f988 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_prefs.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_regexp.js
index c89ccdef88..c89ccdef88 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_regexp.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklistchange.js
index d065f700d7..d065f700d7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklistchange.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap.js
index ff58599bcb..ff58599bcb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_const.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_const.js
index 101d49510f..101d49510f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_const.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_const.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_globals.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_globals.js
index 29b538d21f..29b538d21f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_globals.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_globals.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_resource.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_resource.js
index 7b7883225c..7b7883225c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_resource.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_resource.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901.js
index c13531dff7..c13531dff7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901_2.js
index 8e9f30ef21..8e9f30ef21 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901_2.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug299716.js
index 66656abe69..66656abe69 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug299716.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug299716_2.js
index c183edad49..c183edad49 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716_2.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug299716_2.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug324121.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug324121.js
index 84b6c61898..84b6c61898 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug324121.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug324121.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug335238.js
index 251bdca707..251bdca707 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug335238.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug371495.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug371495.js
index 43656f1261..43656f1261 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug371495.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug371495.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug384052.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug384052.js
index aeaaf3d8ff..aeaaf3d8ff 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug384052.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug384052.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug393285.js
index ebc330cdda..ebc330cdda 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug393285.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug394300.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug394300.js
index bd393b91c4..bd393b91c4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug394300.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug394300.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug397778.js
index aa18a6946a..aa18a6946a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug397778.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug406118.js
index e22ab87c96..e22ab87c96 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug406118.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug424262.js
index 8b29e15a5e..8b29e15a5e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug424262.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug425657.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js
index f11a942fb6..f11a942fb6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug425657.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug430120.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug430120.js
index e13f36a7c5..e13f36a7c5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug430120.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug430120.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug449027.js
index 1512a7f928..1512a7f928 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug449027.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug455906.js
index 06e29b376d..06e29b376d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug455906.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug465190.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug465190.js
index e8e2353e2b..e8e2353e2b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug465190.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug465190.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug468528.js
index 01c976a176..01c976a176 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug468528.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1.js
index 920c3731a2..920c3731a2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1_strictcompat.js
index 6fa11eb396..6fa11eb396 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_2.js
index 0c912ceff8..0c912ceff8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_2.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3.js
index 0d1d30f3be..0d1d30f3be 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3_strictcompat.js
index 100ea99d7d..100ea99d7d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_4.js
index c51c38b0c1..c51c38b0c1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_4.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_1.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_1.js
index 46b65ffff7..46b65ffff7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_1.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_1.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_2.js
index 261739da47..261739da47 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_2.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_3.js
index 6343619910..6343619910 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_3.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug521905.js
index b507fc1001..b507fc1001 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug521905.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug526598.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug526598.js
index debf591723..debf591723 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug526598.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug526598.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug541420.js
index b7af5453f5..b7af5453f5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug541420.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug542391.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug542391.js
index aa1bbd53f5..aa1bbd53f5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug542391.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug542391.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug554133.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug554133.js
index c252e1cedf..c252e1cedf 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug554133.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug554133.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug559800.js
index 866ad3ad7a..866ad3ad7a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug559800.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug563256.js
index 497e665269..497e665269 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug563256.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug564030.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug564030.js
index 92ba3d68fb..92ba3d68fb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug564030.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug564030.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug566626.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug566626.js
index 641ff87c97..641ff87c97 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug566626.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug566626.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug567184.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug567184.js
index 0e78630686..0e78630686 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug567184.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug567184.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug569138.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug569138.js
index 4869fc1173..4869fc1173 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug569138.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug569138.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js
index 2c87d8c799..2c87d8c799 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug576735.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug576735.js
index df64e159d9..df64e159d9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug576735.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug576735.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug587088.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug587088.js
index 8d9857e7f2..8d9857e7f2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug587088.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug587088.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug594058.js
index 858579815c..858579815c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug594058.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug595081.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js
index db53dc7472..db53dc7472 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug595081.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug595573.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595573.js
index 7e2bf7d778..7e2bf7d778 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug595573.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595573.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug596607.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug596607.js
index bdcf93a1f3..bdcf93a1f3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug596607.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug596607.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug616841.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug616841.js
index d0c9739602..d0c9739602 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug616841.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug616841.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug619730.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug619730.js
index 1c21385e09..1c21385e09 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug619730.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug619730.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug620837.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug620837.js
index 6bfbfcaf2c..6bfbfcaf2c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug620837.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug620837.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug655254.js
index 449c590653..449c590653 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug655254.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug659772.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug659772.js
index 6e98a69a4b..6e98a69a4b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug659772.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug659772.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug675371.js
index 6f2a5e7cd9..6f2a5e7cd9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug675371.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug740612.js
index d17e7acde6..d17e7acde6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug740612.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug753900.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug753900.js
index 2068623390..2068623390 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug753900.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug753900.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug757663.js
index 54cee08393..54cee08393 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug757663.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug953156.js
index a7acb9ad2f..a7acb9ad2f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_bug953156.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_cache_certdb.js b/toolkit/mozapps/webextensions/test/xpcshell/test_cache_certdb.js
index edb442aadf..edb442aadf 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_cache_certdb.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_cache_certdb.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_cacheflush.js b/toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js
index f3448abd2f..f3448abd2f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_cacheflush.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_checkCompatibility_themeOverride.js b/toolkit/mozapps/webextensions/test/xpcshell/test_checkCompatibility_themeOverride.js
index b6cb13e087..b6cb13e087 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_checkCompatibility_themeOverride.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_checkCompatibility_themeOverride.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js b/toolkit/mozapps/webextensions/test/xpcshell/test_checkcompatibility.js
index b9fc0b3aba..b9fc0b3aba 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_checkcompatibility.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js b/toolkit/mozapps/webextensions/test/xpcshell/test_childprocess.js
index a6c635eac4..a6c635eac4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_childprocess.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_compatoverrides.js b/toolkit/mozapps/webextensions/test/xpcshell/test_compatoverrides.js
index c079534c37..c079534c37 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_compatoverrides.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_compatoverrides.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js b/toolkit/mozapps/webextensions/test/xpcshell/test_corrupt.js
index 210c6a9368..210c6a9368 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_corrupt.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_corrupt_strictcompat.js
index 6229734722..6229734722 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_corrupt_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corruptfile.js b/toolkit/mozapps/webextensions/test/xpcshell/test_corruptfile.js
index 92b375850f..92b375850f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_corruptfile.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_corruptfile.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dataDirectory.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dataDirectory.js
index bf75818e90..bf75818e90 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_dataDirectory.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_dataDirectory.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_default_providers_pref.js b/toolkit/mozapps/webextensions/test/xpcshell/test_default_providers_pref.js
index 1b61e033a8..1b61e033a8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_default_providers_pref.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_default_providers_pref.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_delay_update.js
index 3d7eef051c..3d7eef051c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_delay_update.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js b/toolkit/mozapps/webextensions/test/xpcshell/test_delay_update_webextension.js
index cdfac8f8c6..cdfac8f8c6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_delay_update_webextension.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dependencies.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dependencies.js
index 3afc03f840..3afc03f840 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_dependencies.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_dependencies.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dictionary.js
index f4b6a05351..f4b6a05351 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_dictionary.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_disable.js b/toolkit/mozapps/webextensions/test/xpcshell/test_disable.js
index 8677158635..8677158635 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_disable.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_disable.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js b/toolkit/mozapps/webextensions/test/xpcshell/test_distribution.js
index 720b454cc8..720b454cc8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_distribution.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dss.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dss.js
index b408cc9c7a..b408cc9c7a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_dss.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_dss.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js b/toolkit/mozapps/webextensions/test/xpcshell/test_duplicateplugins.js
index 4d1848ea47..4d1848ea47 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_duplicateplugins.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js b/toolkit/mozapps/webextensions/test/xpcshell/test_e10s_restartless.js
index 1a3a0e7470..1a3a0e7470 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_e10s_restartless.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_error.js b/toolkit/mozapps/webextensions/test/xpcshell/test_error.js
index 11a465b554..11a465b554 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_error.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_error.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js b/toolkit/mozapps/webextensions/test/xpcshell/test_experiment.js
index 3dcd83da82..3dcd83da82 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_experiment.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ext_management.js b/toolkit/mozapps/webextensions/test/xpcshell/test_ext_management.js
index a3b3f477c8..a3b3f477c8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_ext_management.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_ext_management.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_filepointer.js b/toolkit/mozapps/webextensions/test/xpcshell/test_filepointer.js
index 406489e40c..406489e40c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_filepointer.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_filepointer.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js b/toolkit/mozapps/webextensions/test/xpcshell/test_fuel.js
index 0c3035f766..0c3035f766 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_fuel.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_general.js b/toolkit/mozapps/webextensions/test/xpcshell/test_general.js
index e69b133140..e69b133140 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_general.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_general.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_getresource.js b/toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js
index c83638d545..c83638d545 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_getresource.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Device.js
index 9b0eb54a7a..9b0eb54a7a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Device.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_DriverNew.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_DriverNew.js
index f8b783ff2b..f8b783ff2b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_DriverNew.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_DriverNew.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js
index 1b3410e878..1b3410e878 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js
index 248c9e7f6f..248c9e7f6f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js
index 8b8928bb87..8b8928bb87 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js
index bd5858023a..bd5858023a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js
index b5c5ed2a60..b5c5ed2a60 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js
index ff37e6676f..ff37e6676f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OK.js
index 72b2a2bdc3..72b2a2bdc3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OK.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OS.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OS.js
index fa0deb19a0..fa0deb19a0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OS.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OS.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js
index f01329b458..f01329b458 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js
index 4b1069dc64..4b1069dc64 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js
index 0c5a0dcb75..0c5a0dcb75 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Vendor.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Vendor.js
index 868c48149c..868c48149c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Vendor.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Vendor.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Version.js
index 48174b7727..48174b7727 100755..100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Version.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_prefs.js
index fbb9928798..fbb9928798 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_prefs.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gmpProvider.js
index 545d7d6668..545d7d6668 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_gmpProvider.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_hasbinarycomponents.js b/toolkit/mozapps/webextensions/test/xpcshell/test_hasbinarycomponents.js
index 925e63626f..925e63626f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_hasbinarycomponents.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_hasbinarycomponents.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_hotfix.js b/toolkit/mozapps/webextensions/test/xpcshell/test_hotfix.js
index c9303897f9..c9303897f9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_hotfix.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_hotfix.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_hotfix_cert.js b/toolkit/mozapps/webextensions/test/xpcshell/test_hotfix_cert.js
index 42ee597405..42ee597405 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_hotfix_cert.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_hotfix_cert.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install.js
index 60af3a9fd7..60af3a9fd7 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_install.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install_from_sources.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install_from_sources.js
index 18bb7d74e6..18bb7d74e6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install_from_sources.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_install_from_sources.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install_icons.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install_icons.js
index 70f91c5601..70f91c5601 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install_icons.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_install_icons.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install_strictcompat.js
index 77f806ba27..77f806ba27 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_install_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_isDebuggable.js b/toolkit/mozapps/webextensions/test/xpcshell/test_isDebuggable.js
index 87f2856b0b..87f2856b0b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_isDebuggable.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_isDebuggable.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_isReady.js b/toolkit/mozapps/webextensions/test/xpcshell/test_isReady.js
index 6222398a75..6222398a75 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_isReady.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_isReady.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_json_updatecheck.js b/toolkit/mozapps/webextensions/test/xpcshell/test_json_updatecheck.js
index adf789afbe..adf789afbe 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_json_updatecheck.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_json_updatecheck.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js b/toolkit/mozapps/webextensions/test/xpcshell/test_langpack.js
index a97a14d4df..a97a14d4df 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_langpack.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locale.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locale.js
index b4c7311e53..b4c7311e53 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locale.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_locale.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locked.js
index 86457eab14..86457eab14 100755..100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_locked.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locked2.js
index 4a62c585f0..4a62c585f0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_locked2.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locked_strictcompat.js
index 9e17b4c8be..9e17b4c8be 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_locked_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_manifest.js b/toolkit/mozapps/webextensions/test/xpcshell/test_manifest.js
index 85279ba5dd..85279ba5dd 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_manifest.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_manifest.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js b/toolkit/mozapps/webextensions/test/xpcshell/test_mapURIToAddonID.js
index 1dd05064e4..1dd05064e4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_mapURIToAddonID.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_metadata_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_metadata_update.js
index dbf5db4858..dbf5db4858 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_metadata_update.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_metadata_update.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate1.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate1.js
index 8c13593b91..8c13593b91 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrate1.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate1.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate2.js
index cc7336713f..cc7336713f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrate2.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate2.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate3.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate3.js
index 71bd666034..71bd666034 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrate3.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate3.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate4.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate4.js
index fad015886d..fad015886d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrate4.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate4.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate5.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate5.js
index 885cd5a7c1..885cd5a7c1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrate5.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate5.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrateAddonRepository.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrateAddonRepository.js
index d9cfc87908..d9cfc87908 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrateAddonRepository.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrateAddonRepository.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate_max_version.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate_max_version.js
index 171ac411e3..171ac411e3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_migrate_max_version.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate_max_version.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_multiprocessCompatible.js b/toolkit/mozapps/webextensions/test/xpcshell/test_multiprocessCompatible.js
index 4cd103fa66..4cd103fa66 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_multiprocessCompatible.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_multiprocessCompatible.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js b/toolkit/mozapps/webextensions/test/xpcshell/test_no_addons.js
index a2ea5301e3..a2ea5301e3 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_no_addons.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_nodisable_hidden.js b/toolkit/mozapps/webextensions/test/xpcshell/test_nodisable_hidden.js
index 2d11e9c5b5..2d11e9c5b5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_nodisable_hidden.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_nodisable_hidden.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_onPropertyChanged_appDisabled.js b/toolkit/mozapps/webextensions/test/xpcshell/test_onPropertyChanged_appDisabled.js
index f9b7da073c..f9b7da073c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_onPropertyChanged_appDisabled.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_onPropertyChanged_appDisabled.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_overrideblocklist.js b/toolkit/mozapps/webextensions/test/xpcshell/test_overrideblocklist.js
index c39e432bd1..c39e432bd1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_overrideblocklist.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_overrideblocklist.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pass_symbol.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pass_symbol.js
index 657601e45e..657601e45e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pass_symbol.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_pass_symbol.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_permissions.js b/toolkit/mozapps/webextensions/test/xpcshell/test_permissions.js
index 48fef406f0..48fef406f0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_permissions.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_permissions.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js b/toolkit/mozapps/webextensions/test/xpcshell/test_permissions_prefs.js
index 576f04a652..576f04a652 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_permissions_prefs.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginBlocklistCtp.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginBlocklistCtp.js
index 563b7434ce..563b7434ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pluginBlocklistCtp.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginBlocklistCtp.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginInfoURL.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginInfoURL.js
index e5acb28a49..e5acb28a49 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pluginInfoURL.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginInfoURL.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginchange.js
index 05e17b35ed..05e17b35ed 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginchange.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js b/toolkit/mozapps/webextensions/test/xpcshell/test_plugins.js
index 3f0ac7ebe4..3f0ac7ebe4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_plugins.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pref_properties.js
index c6a10e7c17..c6a10e7c17 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_pref_properties.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_markSafe.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_markSafe.js
index 228eb7d34f..228eb7d34f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_markSafe.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_markSafe.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_shutdown.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_shutdown.js
index d210eb81d0..d210eb81d0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_shutdown.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_shutdown.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
index f90e38292f..f90e38292f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_startup.js
index 1193ddfe44..1193ddfe44 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_startup.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_proxies.js b/toolkit/mozapps/webextensions/test/xpcshell/test_proxies.js
index 7b28c78f2b..7b28c78f2b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_proxies.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_proxies.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_proxy.js b/toolkit/mozapps/webextensions/test/xpcshell/test_proxy.js
index c35870c9ba..c35870c9ba 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_proxy.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_proxy.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_registry.js b/toolkit/mozapps/webextensions/test/xpcshell/test_registry.js
index eab7af6b65..eab7af6b65 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_registry.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_registry.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_reload.js b/toolkit/mozapps/webextensions/test/xpcshell/test_reload.js
index 5873d19807..5873d19807 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_reload.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_reload.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_safemode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js
index 05647f807f..05647f807f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_safemode.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_schema_change.js b/toolkit/mozapps/webextensions/test/xpcshell/test_schema_change.js
index 3d386f6632..3d386f6632 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_schema_change.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_schema_change.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_seen.js b/toolkit/mozapps/webextensions/test/xpcshell/test_seen.js
index e499e7339d..e499e7339d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_seen.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_seen.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_seen_newprofile.js b/toolkit/mozapps/webextensions/test/xpcshell/test_seen_newprofile.js
index 43ee18594e..43ee18594e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_seen_newprofile.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_seen_newprofile.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js b/toolkit/mozapps/webextensions/test/xpcshell/test_shutdown.js
index 725887bc18..725887bc18 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_shutdown.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_inject.js
index 3b96f40ba6..3b96f40ba6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_inject.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_install.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_install.js
index 19b07ac16d..19b07ac16d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_install.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_install.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_long.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_long.js
index b74d7804a6..b74d7804a6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_long.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_long.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_migrate.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_migrate.js
index 97e2ff79fb..97e2ff79fb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_migrate.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_migrate.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_multi.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_multi.js
index 01de29088e..01de29088e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_multi.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_multi.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_updatepref.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_updatepref.js
index eb1bb78b37..eb1bb78b37 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_updatepref.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_updatepref.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_verify.js
index 0b5b30d89f..0b5b30d89f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_verify.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js b/toolkit/mozapps/webextensions/test/xpcshell/test_softblocked.js
index 260b536e1b..260b536e1b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_softblocked.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_sourceURI.js b/toolkit/mozapps/webextensions/test/xpcshell/test_sourceURI.js
index db5e4f7cc9..db5e4f7cc9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_sourceURI.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_sourceURI.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js b/toolkit/mozapps/webextensions/test/xpcshell/test_startup.js
index fdd00c1ad2..fdd00c1ad2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_startup.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_strictcompatibility.js b/toolkit/mozapps/webextensions/test/xpcshell/test_strictcompatibility.js
index cb6704936c..cb6704936c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_strictcompatibility.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_strictcompatibility.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_switch_os.js b/toolkit/mozapps/webextensions/test/xpcshell/test_switch_os.js
index 552d7cfae1..552d7cfae1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_switch_os.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_switch_os.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_syncGUID.js b/toolkit/mozapps/webextensions/test/xpcshell/test_syncGUID.js
index 385f584053..385f584053 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_syncGUID.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_syncGUID.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_system_delay_update.js
index 35964c663f..35964c663f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_system_delay_update.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_reset.js b/toolkit/mozapps/webextensions/test/xpcshell/test_system_reset.js
index 31b7e5783f..31b7e5783f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_system_reset.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_system_reset.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_system_update.js
index c8e3144273..c8e3144273 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_system_update.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_system_update.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_targetPlatforms.js b/toolkit/mozapps/webextensions/test/xpcshell/test_targetPlatforms.js
index ef4f2aee56..ef4f2aee56 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_targetPlatforms.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_targetPlatforms.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js b/toolkit/mozapps/webextensions/test/xpcshell/test_temporary.js
index ec9e25a0b0..ec9e25a0b0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_temporary.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_theme.js b/toolkit/mozapps/webextensions/test/xpcshell/test_theme.js
index 84d6f1d0dd..84d6f1d0dd 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_theme.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_theme.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_types.js b/toolkit/mozapps/webextensions/test/xpcshell/test_types.js
index 679f4808c6..679f4808c6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_types.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_types.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js b/toolkit/mozapps/webextensions/test/xpcshell/test_undothemeuninstall.js
index 36ca95aecc..36ca95aecc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_undothemeuninstall.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js b/toolkit/mozapps/webextensions/test/xpcshell/test_undouninstall.js
index 4680a3c4a6..4680a3c4a6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_undouninstall.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_uninstall.js b/toolkit/mozapps/webextensions/test/xpcshell/test_uninstall.js
index 6b12489f2b..6b12489f2b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_uninstall.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_uninstall.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update.js
index 4db488ab57..4db488ab57 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_update.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_update.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js b/toolkit/mozapps/webextensions/test/xpcshell/test_updateCancel.js
index b50fd4a55d..b50fd4a55d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_updateCancel.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_compatmode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_compatmode.js
index a1d8720090..a1d8720090 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_update_compatmode.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_update_compatmode.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_ignorecompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_ignorecompat.js
index e899619d61..e899619d61 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_update_ignorecompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_update_ignorecompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_strictcompat.js
index 2b1f65a9f6..2b1f65a9f6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_update_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_update_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_webextensions.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_webextensions.js
index ff5d5d321b..ff5d5d321b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_update_webextensions.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_update_webextensions.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js b/toolkit/mozapps/webextensions/test/xpcshell/test_updatecheck.js
index e8529bb2cb..e8529bb2cb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_updatecheck.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js b/toolkit/mozapps/webextensions/test/xpcshell/test_updateid.js
index f7e3e21e56..f7e3e21e56 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_updateid.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_upgrade.js b/toolkit/mozapps/webextensions/test/xpcshell/test_upgrade.js
index dc3d9438a8..dc3d9438a8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_upgrade.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_upgrade.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_upgrade_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_upgrade_strictcompat.js
index c2203d097c..c2203d097c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_upgrade_strictcompat.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_upgrade_strictcompat.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension.js
index b51f479770..b51f479770 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_embedded.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_embedded.js
index 3bd8a2bd83..3bd8a2bd83 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_embedded.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_embedded.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_icons.js
index 25fb4115f2..25fb4115f2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_icons.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_install.js
index 1e7c9d9b72..1e7c9d9b72 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_install.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_paths.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_paths.js
index 29a3dacf79..29a3dacf79 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_paths.js
+++ b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_paths.js
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell-shared.ini
index 1e86e58616..1e86e58616 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell-shared.ini
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell-unpack.ini
index 42a0ca1ca0..42a0ca1ca0 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini
+++ b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell-unpack.ini
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell.ini
index 2b95eb1586..2b95eb1586 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell.ini
diff --git a/toolkit/mozapps/extensions/test/xpinstall/.eslintrc.js b/toolkit/mozapps/webextensions/test/xpinstall/.eslintrc.js
index 2852eb81d1..2852eb81d1 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/.eslintrc.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/.eslintrc.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi b/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi
index 4edf91e34a..4edf91e34a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/amosigned2.xpi b/toolkit/mozapps/webextensions/test/xpinstall/amosigned2.xpi
index 74e877f26f..74e877f26f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/amosigned2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/amosigned2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/authRedirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/authRedirect.sjs
index 85d448e2bd..85d448e2bd 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/authRedirect.sjs
+++ b/toolkit/mozapps/webextensions/test/xpinstall/authRedirect.sjs
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser.ini b/toolkit/mozapps/webextensions/test/xpinstall/browser.ini
index 5627f47a27..5627f47a27 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser.ini
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser.ini
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger.js
index d61ef73624..d61ef73624 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger_iframe.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger_iframe.js
index 66564afaae..66564afaae 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger_iframe.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger_iframe.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_url.js
index f6c39b7bb8..f6c39b7bb8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_url.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth.js
index 1bfa7696f8..1bfa7696f8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth2.js
index 80942a9f41..80942a9f41 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth3.js
index 4973a1b350..4973a1b350 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth4.js
index a3157961dc..a3157961dc 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth4.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badargs.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js
index b4b1110b0e..b4b1110b0e 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_badargs.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badargs2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs2.js
index 7137df318d..7137df318d 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_badargs2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badhash.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badhash.js
index 9a26a77e49..9a26a77e49 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_badhash.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_badhash.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badhashtype.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badhashtype.js
index a9de9e4f03..a9de9e4f03 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_badhashtype.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_badhashtype.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug540558.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug540558.js
index 4e7e207176..4e7e207176 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_bug540558.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug540558.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug611242.js
index 4f3cd087f4..4f3cd087f4 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug611242.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug638292.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js
index 0d96e7cbe6..0d96e7cbe6 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_bug638292.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug645699.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug645699.js
index f32d2c9d27..f32d2c9d27 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_bug645699.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug645699.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug672485.js
index 81d89c025a..81d89c025a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug672485.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cancel.js
index e30d7a0e58..e30d7a0e58 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_cancel.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_concurrent_installs.js
index bf919d89cc..bf919d89cc 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_concurrent_installs.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies.js
index 541ac83336..541ac83336 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies2.js
index 1ef2b482f8..1ef2b482f8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies3.js
index 833562d154..833562d154 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies4.js
index 792146c648..792146c648 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies4.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies4.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_corrupt.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_corrupt.js
index bd4d27fb09..bd4d27fb09 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_corrupt.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_corrupt.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_datauri.js
index a8bdbde39a..a8bdbde39a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_datauri.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_empty.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_empty.js
index 64ca5e6b9a..64ca5e6b9a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_empty.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_empty.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled.js
index adbec94994..adbec94994 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js
index cc1b8a8b23..cc1b8a8b23 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled3.js
index 15bad4ba9b..15bad4ba9b 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_hash.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_hash.js
index 4c45bd1844..4c45bd1844 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_hash.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_hash.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_hash2.js
index 4c8e262c7c..4c8e262c7c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_hash2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash.js
index 6a1222797c..6a1222797c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash2.js
index 2d930d2219..2d930d2219 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash3.js
index 5f3ef23ca4..5f3ef23ca4 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash4.js
index 3983662af3..3983662af3 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash4.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash4.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash5.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash5.js
index 407158e4fd..407158e4fd 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash5.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash5.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash6.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash6.js
index 5e1da8175f..5e1da8175f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash6.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash6.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_installchrome.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_installchrome.js
index 2380a4df2d..2380a4df2d 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_installchrome.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_installchrome.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile.js
index 997f386a65..997f386a65 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js
index b0e3ffc42b..b0e3ffc42b 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile3.js
index 891b85ebcb..891b85ebcb 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile4.js
index 5203c3153f..5203c3153f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile4.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_multipackage.js
index d022d713ad..d022d713ad 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_multipackage.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway.js
index f092edb8c4..f092edb8c4 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway2.js
index a41662e1ec..a41662e1ec 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway3.js
index 3948d56497..3948d56497 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway4.js
index 61844c5a1a..61844c5a1a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway4.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway4.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_offline.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_offline.js
index eb4ac391f6..eb4ac391f6 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_offline.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_offline.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_relative.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_relative.js
index 3599f47d1a..3599f47d1a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_relative.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_relative.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multipackage.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multipackage.js
index 7341f30829..7341f30829 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multipackage.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multipackage.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multiple.js
index 9dda1aaeb8..9dda1aaeb8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multiple.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_naming.js
index 5c3f790451..5c3f790451 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_naming.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_tampered.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_tampered.js
index fc798d66af..fc798d66af 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_tampered.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_tampered.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_trigger.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_trigger.js
index 8f1ae2d87c..8f1ae2d87c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_trigger.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_trigger.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_untrusted.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_untrusted.js
index d5fa9ae017..d5fa9ae017 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_untrusted.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_untrusted.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_url.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_url.js
index 33cda6e4c2..33cda6e4c2 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_url.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_url.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_softwareupdate.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_softwareupdate.js
index 16e20f3e9a..16e20f3e9a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_softwareupdate.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_softwareupdate.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_switchtab.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_switchtab.js
index 9bbb594005..9bbb594005 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_switchtab.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_switchtab.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_trigger_redirect.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_trigger_redirect.js
index 9c05436029..9c05436029 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_trigger_redirect.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_trigger_redirect.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger.js
index 0068794396..0068794396 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_iframe.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_iframe.js
index b9df6615e9..b9df6615e9 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_iframe.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_iframe.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_xorigin.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_xorigin.js
index b0875fc999..b0875fc999 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_xorigin.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_xorigin.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_url.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_url.js
index e103dffd30..e103dffd30 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_url.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_url.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist.js
index ad3d645f57..ad3d645f57 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist2.js
index fd9e944e8a..fd9e944e8a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist2.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist2.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist3.js
index 6f4306df60..6f4306df60 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist3.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist4.js
index e4c47cda56..e4c47cda56 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist4.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist5.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist5.js
index 0a9333430a..0a9333430a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist5.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist5.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist6.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist6.js
index 555f1e2fcb..555f1e2fcb 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist6.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist6.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist7.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist7.js
index 96c60ac9e8..96c60ac9e8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist7.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist7.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug540558.html b/toolkit/mozapps/webextensions/test/xpinstall/bug540558.html
index 286046d25b..286046d25b 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/bug540558.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/bug540558.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug638292.html b/toolkit/mozapps/webextensions/test/xpinstall/bug638292.html
index 198207d4bf..198207d4bf 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/bug638292.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/bug638292.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html b/toolkit/mozapps/webextensions/test/xpinstall/bug645699.html
index 8334c37c26..8334c37c26 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/bug645699.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html b/toolkit/mozapps/webextensions/test/xpinstall/concurrent_installs.html
index 780409257d..780409257d 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/concurrent_installs.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/cookieRedirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/cookieRedirect.sjs
index 92bccd9ec1..92bccd9ec1 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/cookieRedirect.sjs
+++ b/toolkit/mozapps/webextensions/test/xpinstall/cookieRedirect.sjs
diff --git a/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi b/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi
index 35d7bd5e5d..35d7bd5e5d 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/empty.xpi b/toolkit/mozapps/webextensions/test/xpinstall/empty.xpi
index 74ed2b8174..74ed2b8174 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/empty.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/empty.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/enabled.html b/toolkit/mozapps/webextensions/test/xpinstall/enabled.html
index 370cde8fb0..370cde8fb0 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/enabled.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/enabled.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/hashRedirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/hashRedirect.sjs
index 324a092a37..324a092a37 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/hashRedirect.sjs
+++ b/toolkit/mozapps/webextensions/test/xpinstall/hashRedirect.sjs
diff --git a/toolkit/mozapps/extensions/test/xpinstall/head.js b/toolkit/mozapps/webextensions/test/xpinstall/head.js
index 197fe3fac1..197fe3fac1 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/head.js
+++ b/toolkit/mozapps/webextensions/test/xpinstall/head.js
diff --git a/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi b/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi
index 262ed38a79..262ed38a79 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/installchrome.html b/toolkit/mozapps/webextensions/test/xpinstall/installchrome.html
index 6abee2ef3d..6abee2ef3d 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/installchrome.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/installchrome.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html b/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html
index 65cab1ef1d..65cab1ef1d 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html b/toolkit/mozapps/webextensions/test/xpinstall/installtrigger_frame.html
index 2b302642e8..2b302642e8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/installtrigger_frame.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/multipackage.xpi b/toolkit/mozapps/webextensions/test/xpinstall/multipackage.xpi
index d52f28c287..d52f28c287 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/multipackage.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/multipackage.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/navigate.html b/toolkit/mozapps/webextensions/test/xpinstall/navigate.html
index 5a6903eb91..5a6903eb91 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/navigate.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/navigate.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/redirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/redirect.sjs
index d248bfbc7f..d248bfbc7f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/redirect.sjs
+++ b/toolkit/mozapps/webextensions/test/xpinstall/redirect.sjs
diff --git a/toolkit/mozapps/extensions/test/xpinstall/restartless-unsigned.xpi b/toolkit/mozapps/webextensions/test/xpinstall/restartless-unsigned.xpi
index 8e76bd052c..8e76bd052c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/restartless-unsigned.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/restartless-unsigned.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi b/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi
index 9fee8f60b1..9fee8f60b1 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-multipackage.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-multipackage.xpi
index 11fbe1861a..11fbe1861a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed-multipackage.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed-multipackage.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-no-cn.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-no-cn.xpi
index 90d3a3ce66..90d3a3ce66 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed-no-cn.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed-no-cn.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-no-o.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-no-o.xpi
index 19b7540380..19b7540380 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed-no-o.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed-no-o.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-tampered.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-tampered.xpi
index 8c951881e5..8c951881e5 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed-tampered.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed-tampered.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-untrusted.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-untrusted.xpi
index 09789d1897..09789d1897 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed-untrusted.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed-untrusted.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed.xpi
index bd7f78b7c7..bd7f78b7c7 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed2.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed2.xpi
index 085efbbf7f..085efbbf7f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/signed2.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/signed2.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs b/toolkit/mozapps/webextensions/test/xpinstall/slowinstall.sjs
index 5f767a8f49..5f767a8f49 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs
+++ b/toolkit/mozapps/webextensions/test/xpinstall/slowinstall.sjs
diff --git a/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html b/toolkit/mozapps/webextensions/test/xpinstall/startsoftwareupdate.html
index 50083ca90e..50083ca90e 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/startsoftwareupdate.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/theme.xpi b/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi
index 74e650b4a8..74e650b4a8 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/theme.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi
diff --git a/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html b/toolkit/mozapps/webextensions/test/xpinstall/triggerredirect.html
index 42e0e1cd01..42e0e1cd01 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
+++ b/toolkit/mozapps/webextensions/test/xpinstall/triggerredirect.html
diff --git a/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi b/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi
index 51b00475a9..51b00475a9 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi
+++ b/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi
diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index 8d1c12305d..0965662bdc 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -6,21 +6,23 @@ toolkit.jar:
 #include ../../shared/mozapps.inc.mn
   skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
   skin/classic/mozapps/downloads/downloads.css             (downloads/downloads.css)
-* skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
-  skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
-  skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
-  skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
-  skin/classic/mozapps/extensions/category-service.png     (extensions/category-service.png)
-  skin/classic/mozapps/extensions/category-recent.png      (extensions/category-recent.png)
-  skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
-  skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
-  skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
-  skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
-  skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
-* skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
-  skin/classic/mozapps/extensions/heart.png                (extensions/heart.png)
+#ifdef MOZ_WEBEXTENSIONS
+* skin/classic/mozapps/extensions/extensions.css           (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/category-search.png      (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png    (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png     (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png     (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-recent.png      (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png   (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png  (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png    (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png         (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png      (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/localeGeneric.png        (webextensions/localeGeneric.png)
+* skin/classic/mozapps/extensions/newaddon.css             (webextensions/newaddon.css)
+  skin/classic/mozapps/extensions/heart.png                (webextensions/heart.png)
+#endif
   skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
diff --git a/toolkit/themes/linux/mozapps/extensions/category-available.png b/toolkit/themes/linux/mozapps/webextensions/category-available.png
index 689d526c9d..689d526c9d 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-available.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-discover.png b/toolkit/themes/linux/mozapps/webextensions/category-discover.png
index ccea27524f..ccea27524f 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-plugins.png b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png
index b253dd08f9..b253dd08f9 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-recent.png b/toolkit/themes/linux/mozapps/webextensions/category-recent.png
index 9039b27aac..9039b27aac 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-search.png b/toolkit/themes/linux/mozapps/webextensions/category-search.png
index 52e91a7cea..52e91a7cea 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-search.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-service.png b/toolkit/themes/linux/mozapps/webextensions/category-service.png
index 997c8541ca..997c8541ca 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-service.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png
index 08a0447a47..08a0447a47 100644
--- a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png
index a1e0d53596..a1e0d53596 100644
--- a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/linux/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png
index b1a2f36521..b1a2f36521 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/webextensions/extensions.css
index a756699377..5a11df1191 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 #header-utils-btn .toolbarbutton-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native");
diff --git a/toolkit/themes/linux/mozapps/extensions/heart.png b/toolkit/themes/linux/mozapps/webextensions/heart.png
index 655f4c4be7..655f4c4be7 100644
--- a/toolkit/themes/linux/mozapps/extensions/heart.png
+++ b/toolkit/themes/linux/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/linux/mozapps/extensions/localeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png
index c721159066..c721159066 100644
--- a/toolkit/themes/linux/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/newaddon.css b/toolkit/themes/linux/mozapps/webextensions/newaddon.css
index edfba0ef55..5856c08b54 100644
--- a/toolkit/themes/windows/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/linux/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/linux/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png
index 019886fea5..019886fea5 100644
--- a/toolkit/themes/linux/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/linux/mozapps/extensions/themeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png
index cde1c7834b..cde1c7834b 100644
--- a/toolkit/themes/linux/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 3f57170734..8da83da161 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -8,34 +8,36 @@ toolkit.jar:
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)
 * skin/classic/mozapps/downloads/downloads.css                    (downloads/downloads.css)
   skin/classic/mozapps/downloads/unknownContentType.css           (downloads/unknownContentType.css)
-  skin/classic/mozapps/extensions/category-search.png             (extensions/category-search.png)
-  skin/classic/mozapps/extensions/category-discover.png           (extensions/category-discover.png)
-  skin/classic/mozapps/extensions/category-plugins.png            (extensions/category-plugins.png)
-  skin/classic/mozapps/extensions/category-service.png            (extensions/category-service.png)
-  skin/classic/mozapps/extensions/category-dictionaries.png       (extensions/category-dictionaries.png)
-  skin/classic/mozapps/extensions/category-experiments.png        (extensions/category-experiments.png)
-  skin/classic/mozapps/extensions/category-recent.png             (extensions/category-recent.png)
-  skin/classic/mozapps/extensions/category-available.png          (extensions/category-available.png)
-  skin/classic/mozapps/extensions/discover-logo.png               (extensions/discover-logo.png)
-  skin/classic/mozapps/extensions/extensionGeneric-16.png         (extensions/extensionGeneric-16.png)
-  skin/classic/mozapps/extensions/themeGeneric.png                (extensions/themeGeneric.png)
-  skin/classic/mozapps/extensions/themeGeneric-16.png             (extensions/themeGeneric-16.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric.png           (extensions/dictionaryGeneric.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (extensions/dictionaryGeneric-16.png)
-  skin/classic/mozapps/extensions/experimentGeneric.png           (extensions/experimentGeneric.png)
-  skin/classic/mozapps/extensions/localeGeneric.png               (extensions/localeGeneric.png)
-  skin/classic/mozapps/extensions/rating-won.png                  (extensions/rating-won.png)
-  skin/classic/mozapps/extensions/rating-not-won.png              (extensions/rating-not-won.png)
-  skin/classic/mozapps/extensions/cancel.png                      (extensions/cancel.png)
-  skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
-  skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
-  skin/classic/mozapps/extensions/search.png                      (extensions/search.png)
-  skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
-* skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
-  skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
-  skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
-  skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
-* skin/classic/mozapps/extensions/newaddon.css                    (extensions/newaddon.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/category-search.png             (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png           (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png            (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png            (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-dictionaries.png       (webextensions/category-dictionaries.png)
+  skin/classic/mozapps/extensions/category-experiments.png        (webextensions/category-experiments.png)
+  skin/classic/mozapps/extensions/category-recent.png             (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png          (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/discover-logo.png               (webextensions/discover-logo.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png         (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png                (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png             (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png           (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png           (webextensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/localeGeneric.png               (webextensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png                  (webextensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png              (webextensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                      (webextensions/cancel.png)
+  skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (webextensions/toolbarbutton-dropmarker.png)
+  skin/classic/mozapps/extensions/heart.png                       (webextensions/heart.png)
+  skin/classic/mozapps/extensions/search.png                      (webextensions/search.png)
+  skin/classic/mozapps/extensions/about.css                       (webextensions/about.css)
+* skin/classic/mozapps/extensions/extensions.css                  (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/update.css                      (webextensions/update.css)
+  skin/classic/mozapps/extensions/eula.css                        (webextensions/eula.css)
+  skin/classic/mozapps/extensions/blocklist.css                   (webextensions/blocklist.css)
+* skin/classic/mozapps/extensions/newaddon.css                    (webextensions/newaddon.css)
+#endif
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)
@@ -48,7 +50,9 @@ toolkit.jar:
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
 * skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
-  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (webextensions/xpinstallConfirm.css)
+#endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
 #ifdef MOZ_PHOENIX
@@ -56,7 +60,9 @@ toolkit.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
+#ifdef MOZ_WEBEXTENSIONS
 % override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
 % override chrome://mozapps/skin/extensions/category-languages.png        chrome://mozapps/skin/extensions/localeGeneric.png
 % override chrome://mozapps/skin/extensions/category-themes.png           chrome://mozapps/skin/extensions/themeGeneric.png
+#endif
 % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png          chrome://mozapps/skin/plugins/notifyPluginGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/about.css b/toolkit/themes/osx/mozapps/webextensions/about.css
index c13ce5f598..c13ce5f598 100644
--- a/toolkit/themes/osx/mozapps/extensions/about.css
+++ b/toolkit/themes/osx/mozapps/webextensions/about.css
diff --git a/toolkit/themes/osx/mozapps/extensions/blocklist.css b/toolkit/themes/osx/mozapps/webextensions/blocklist.css
index 02f6e1d494..02f6e1d494 100644
--- a/toolkit/themes/osx/mozapps/extensions/blocklist.css
+++ b/toolkit/themes/osx/mozapps/webextensions/blocklist.css
diff --git a/toolkit/themes/osx/mozapps/extensions/cancel.png b/toolkit/themes/osx/mozapps/webextensions/cancel.png
index 0d98ab2359..0d98ab2359 100644
--- a/toolkit/themes/osx/mozapps/extensions/cancel.png
+++ b/toolkit/themes/osx/mozapps/webextensions/cancel.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-available.png b/toolkit/themes/osx/mozapps/webextensions/category-available.png
index d1b737ab05..d1b737ab05 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-available.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png
index 54ae4f93fc..54ae4f93fc 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-discover.png b/toolkit/themes/osx/mozapps/webextensions/category-discover.png
index a6f5b49b37..a6f5b49b37 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-experiments.png b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png
index a9d00545ef..a9d00545ef 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-experiments.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-plugins.png b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png
index 5c4d8bf471..5c4d8bf471 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-recent.png b/toolkit/themes/osx/mozapps/webextensions/category-recent.png
index 7ecfc7d4c8..7ecfc7d4c8 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-search.png b/toolkit/themes/osx/mozapps/webextensions/category-search.png
index 52e91a7cea..52e91a7cea 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-search.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-service.png b/toolkit/themes/osx/mozapps/webextensions/category-service.png
index 997c8541ca..997c8541ca 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-service.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png
index 4ad1a1a825..4ad1a1a825 100644
--- a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png
index 54ae4f93fc..54ae4f93fc 100644
--- a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/discover-logo.png b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png
index cd50735a89..cd50735a89 100644
--- a/toolkit/themes/osx/mozapps/extensions/discover-logo.png
+++ b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png
diff --git a/toolkit/themes/osx/mozapps/extensions/eula.css b/toolkit/themes/osx/mozapps/webextensions/eula.css
index 05aeb3c1c4..05aeb3c1c4 100644
--- a/toolkit/themes/osx/mozapps/extensions/eula.css
+++ b/toolkit/themes/osx/mozapps/webextensions/eula.css
diff --git a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png
index a9d00545ef..a9d00545ef 100644
--- a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png
index fc6c8a2583..fc6c8a2583 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/webextensions/extensions.css
index d4dac2f012..cbdd9a5b06 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 .no-auto-hide > .menulist-dropmarker {
   padding-inline-start: 0px !important;
diff --git a/toolkit/themes/osx/mozapps/extensions/heart.png b/toolkit/themes/osx/mozapps/webextensions/heart.png
index 655f4c4be7..655f4c4be7 100644
--- a/toolkit/themes/osx/mozapps/extensions/heart.png
+++ b/toolkit/themes/osx/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png
index 4d9ac5ad89..4d9ac5ad89 100644
--- a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/linux/mozapps/extensions/newaddon.css b/toolkit/themes/osx/mozapps/webextensions/newaddon.css
index edfba0ef55..5856c08b54 100644
--- a/toolkit/themes/linux/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/osx/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png
index 2761f19255..2761f19255 100644
--- a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png
+++ b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png
diff --git a/toolkit/themes/osx/mozapps/extensions/rating-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-won.png
index 336dd8f6eb..336dd8f6eb 100644
--- a/toolkit/themes/osx/mozapps/extensions/rating-won.png
+++ b/toolkit/themes/osx/mozapps/webextensions/rating-won.png
diff --git a/toolkit/themes/osx/mozapps/extensions/search.png b/toolkit/themes/osx/mozapps/webextensions/search.png
index 93196dbbf6..93196dbbf6 100644
--- a/toolkit/themes/osx/mozapps/extensions/search.png
+++ b/toolkit/themes/osx/mozapps/webextensions/search.png
diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png
index 190bb30d71..190bb30d71 100644
--- a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png
index be645f76df..be645f76df 100644
--- a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png
index e7674c62a6..e7674c62a6 100644
--- a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png
+++ b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png
diff --git a/toolkit/themes/osx/mozapps/extensions/update.css b/toolkit/themes/osx/mozapps/webextensions/update.css
index a0a016868c..a0a016868c 100644
--- a/toolkit/themes/osx/mozapps/extensions/update.css
+++ b/toolkit/themes/osx/mozapps/webextensions/update.css
diff --git a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css
index 48af7c1a91..48af7c1a91 100644
--- a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css
diff --git a/toolkit/themes/shared/mozapps.inc.mn b/toolkit/themes/shared/mozapps.inc.mn
index bb43fd4d2c..fadd203b00 100644
--- a/toolkit/themes/shared/mozapps.inc.mn
+++ b/toolkit/themes/shared/mozapps.inc.mn
@@ -7,13 +7,15 @@
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
-  skin/classic/mozapps/extensions/extensionGeneric.svg       (../../shared/extensions/extensionGeneric.svg)
-  skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
-  skin/classic/mozapps/extensions/navigation.png             (../../shared/extensions/navigation.png)
-  skin/classic/mozapps/extensions/alerticon-warning.svg      (../../shared/extensions/alerticon-warning.svg)
-  skin/classic/mozapps/extensions/alerticon-error.svg        (../../shared/extensions/alerticon-error.svg)
-  skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg)
-  skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/extensionGeneric.svg       (../../shared/webextensions/extensionGeneric.svg)
+  skin/classic/mozapps/extensions/utilities.svg              (../../shared/webextensions/utilities.svg)
+  skin/classic/mozapps/extensions/navigation.png             (../../shared/webextensions/navigation.png)
+  skin/classic/mozapps/extensions/alerticon-warning.svg      (../../shared/webextensions/alerticon-warning.svg)
+  skin/classic/mozapps/extensions/alerticon-error.svg        (../../shared/webextensions/alerticon-error.svg)
+  skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/webextensions/alerticon-info-positive.svg)
+  skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/webextensions/alerticon-info-negative.svg)
+#endif
   skin/classic/mozapps/formautofill/requestAutocomplete.css  (../../shared/formautofill/requestAutocomplete.css)
   skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
   skin/classic/mozapps/aboutNetworking.css                   (../../shared/aboutNetworking.css)
diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn
index 859f1ba4a5..a783bbb3c0 100644
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -107,27 +107,32 @@
 
   skin/classic/mozapps/downloads/downloadButtons.png         (../../windows/mozapps/downloads/downloadButtons.png)
   skin/classic/mozapps/downloads/unknownContentType.css      (../../windows/mozapps/downloads/unknownContentType.css)
-  skin/classic/mozapps/extensions/about.css                  (../../windows/mozapps/extensions/about.css)
-  skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/extensions/blocklist.css)
-  skin/classic/mozapps/extensions/update.css                 (../../windows/mozapps/extensions/update.css)
-  skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/extensions/discover-logo.png)
-  skin/classic/mozapps/extensions/experimentGeneric.png      (../../windows/mozapps/extensions/experimentGeneric.png)
-  skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/extensions/rating-won.png)
-  skin/classic/mozapps/extensions/rating-not-won.png         (../../windows/mozapps/extensions/rating-not-won.png)
-  skin/classic/mozapps/extensions/cancel.png                 (../../windows/mozapps/extensions/cancel.png)
-  skin/classic/mozapps/extensions/eula.css                   (../../windows/mozapps/extensions/eula.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/about.css                  (../../windows/mozapps/webextensions/about.css)
+  skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/webextensions/blocklist.css)
+  skin/classic/mozapps/extensions/update.css                 (../../windows/mozapps/webextensions/update.css)
+  skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/webextensions/discover-logo.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png      (../../windows/mozapps/webextensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/webextensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png         (../../windows/mozapps/webextensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                 (../../windows/mozapps/webextensions/cancel.png)
+  skin/classic/mozapps/extensions/eula.css                   (../../windows/mozapps/webextensions/eula.css)
+#endif
   skin/classic/mozapps/handling/handling.css                 (../../windows/mozapps/handling/handling.css)
   skin/classic/mozapps/plugins/pluginBlocked-64.png          (../../windows/mozapps/plugins/pluginBlocked-64.png)
   skin/classic/mozapps/plugins/pluginHelp-16.png             (../../windows/mozapps/plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileSelection.css          (../../windows/mozapps/profile/profileSelection.css)
   skin/classic/mozapps/update/downloadButtons.png            (../../windows/mozapps/update/downloadButtons.png)
-* skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (../../windows/mozapps/extensions/xpinstallConfirm.css)
+#ifdef MOZ_WEBEXTENSIONS
+* skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (../../windows/mozapps/webextensions/xpinstallConfirm.css)
+#endif
 
 #ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
+#ifdef MOZ_WEBEXTENSIONS
 % override chrome://global/skin/arrow/arrow-lft-hov.gif           chrome://global/skin/arrow/arrow-lft.gif
 % override chrome://global/skin/arrow/arrow-rit-hov.gif           chrome://global/skin/arrow/arrow-rit.gif
 % override chrome://mozapps/skin/extensions/category-dictionaries.png     chrome://mozapps/skin/extensions/dictionaryGeneric.png
@@ -138,4 +143,4 @@
 % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png          chrome://mozapps/skin/plugins/pluginGeneric-16.png
 % override chrome://mozapps/skin/plugins/notifyPluginGeneric.png          chrome://mozapps/skin/plugins/pluginGeneric-16.png
 % override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png       chrome://mozapps/skin/extensions/extensionGeneric.png
-
+#endif
diff --git a/toolkit/themes/shared/extensions/alerticon-error.svg b/toolkit/themes/shared/webextensions/alerticon-error.svg
index cb883e16e9..cb883e16e9 100644
--- a/toolkit/themes/shared/extensions/alerticon-error.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-error.svg
diff --git a/toolkit/themes/shared/extensions/alerticon-info-negative.svg b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg
index 733f8571aa..733f8571aa 100644
--- a/toolkit/themes/shared/extensions/alerticon-info-negative.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg
diff --git a/toolkit/themes/shared/extensions/alerticon-info-positive.svg b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg
index 031190bce8..031190bce8 100644
--- a/toolkit/themes/shared/extensions/alerticon-info-positive.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg
diff --git a/toolkit/themes/shared/extensions/alerticon-warning.svg b/toolkit/themes/shared/webextensions/alerticon-warning.svg
index 2b403220ec..2b403220ec 100644
--- a/toolkit/themes/shared/extensions/alerticon-warning.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-warning.svg
diff --git a/toolkit/themes/shared/extensions/extensionGeneric.svg b/toolkit/themes/shared/webextensions/extensionGeneric.svg
index 28c2f7ba38..28c2f7ba38 100644
--- a/toolkit/themes/shared/extensions/extensionGeneric.svg
+++ b/toolkit/themes/shared/webextensions/extensionGeneric.svg
diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/webextensions/extensions.inc.css
index c4523bbe64..c4523bbe64 100644
--- a/toolkit/themes/shared/extensions/extensions.inc.css
+++ b/toolkit/themes/shared/webextensions/extensions.inc.css
diff --git a/toolkit/themes/shared/extensions/navigation.png b/toolkit/themes/shared/webextensions/navigation.png
index 67ff3d9a76..67ff3d9a76 100644
--- a/toolkit/themes/shared/extensions/navigation.png
+++ b/toolkit/themes/shared/webextensions/navigation.png
diff --git a/toolkit/themes/shared/extensions/newaddon.inc.css b/toolkit/themes/shared/webextensions/newaddon.inc.css
index 52352ccd26..52352ccd26 100644
--- a/toolkit/themes/shared/extensions/newaddon.inc.css
+++ b/toolkit/themes/shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/shared/extensions/utilities.svg b/toolkit/themes/shared/webextensions/utilities.svg
index 8bf24458ce..8bf24458ce 100644
--- a/toolkit/themes/shared/extensions/utilities.svg
+++ b/toolkit/themes/shared/webextensions/utilities.svg
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 901e93e4e7..b5907d0166 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -6,21 +6,23 @@ toolkit.jar:
 #include ../../shared/mozapps.inc.mn
   skin/classic/mozapps/downloads/downloadIcon.png            (downloads/downloadIcon.png)
   skin/classic/mozapps/downloads/downloads.css               (downloads/downloads.css)
-* skin/classic/mozapps/extensions/extensions.css             (extensions/extensions.css)
-  skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)
-  skin/classic/mozapps/extensions/category-discover.png      (extensions/category-discover.png)
-  skin/classic/mozapps/extensions/category-plugins.png       (extensions/category-plugins.png)
-  skin/classic/mozapps/extensions/category-service.png       (extensions/category-service.png)
-  skin/classic/mozapps/extensions/category-recent.png        (extensions/category-recent.png)
-  skin/classic/mozapps/extensions/category-available.png     (extensions/category-available.png)
-  skin/classic/mozapps/extensions/extensionGeneric-16.png    (extensions/extensionGeneric-16.png)
-  skin/classic/mozapps/extensions/themeGeneric.png           (extensions/themeGeneric.png)
-  skin/classic/mozapps/extensions/themeGeneric-16.png        (extensions/themeGeneric-16.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric.png      (extensions/dictionaryGeneric.png)
-  skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (extensions/dictionaryGeneric-16.png)
-  skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
-  skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
-* skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
+#ifdef MOZ_WEBEXTENSIONS
+* skin/classic/mozapps/extensions/extensions.css             (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/category-search.png        (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png      (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png       (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png       (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-recent.png        (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png     (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png    (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png           (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png        (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png      (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/localeGeneric.png          (webextensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/heart.png                  (webextensions/heart.png)
+* skin/classic/mozapps/extensions/newaddon.css               (webextensions/newaddon.css)
+#endif
   skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
@@ -29,14 +31,16 @@ toolkit.jar:
   skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
   skin/classic/mozapps/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
   skin/classic/mozapps/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
-  skin/classic/mozapps/extensions/category-discover-XP.png   (extensions/category-discover-XP.png)
-  skin/classic/mozapps/extensions/category-plugins-XP.png    (extensions/category-plugins-XP.png)
-  skin/classic/mozapps/extensions/category-recent-XP.png     (extensions/category-recent-XP.png)
-  skin/classic/mozapps/extensions/category-available-XP.png  (extensions/category-available-XP.png)
-  skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (extensions/extensionGeneric-16-XP.png)
-  skin/classic/mozapps/extensions/themeGeneric-XP.png        (extensions/themeGeneric-XP.png)
-  skin/classic/mozapps/extensions/themeGeneric-16-XP.png     (extensions/themeGeneric-16-XP.png)
-  skin/classic/mozapps/extensions/localeGeneric-XP.png       (extensions/localeGeneric-XP.png)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/category-discover-XP.png   (webextensions/category-discover-XP.png)
+  skin/classic/mozapps/extensions/category-plugins-XP.png    (webextensions/category-plugins-XP.png)
+  skin/classic/mozapps/extensions/category-recent-XP.png     (webextensions/category-recent-XP.png)
+  skin/classic/mozapps/extensions/category-available-XP.png  (webextensions/category-available-XP.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (webextensions/extensionGeneric-16-XP.png)
+  skin/classic/mozapps/extensions/themeGeneric-XP.png        (webextensions/themeGeneric-XP.png)
+  skin/classic/mozapps/extensions/themeGeneric-16-XP.png     (webextensions/themeGeneric-16-XP.png)
+  skin/classic/mozapps/extensions/localeGeneric-XP.png       (webextensions/localeGeneric-XP.png)
+#endif
   skin/classic/mozapps/plugins/pluginGeneric-XP.png          (plugins/pluginGeneric-XP.png)
   skin/classic/mozapps/plugins/pluginBlocked-XP.png          (plugins/pluginBlocked-XP.png)
   skin/classic/mozapps/plugins/pluginGeneric-16-XP.png       (plugins/pluginGeneric-16-XP.png)
@@ -50,6 +54,7 @@ toolkit.jar:
 #endif
 % override chrome://mozapps/skin/downloads/downloadButtons.png            chrome://mozapps/skin/downloads/downloadButtons-XP.png        osversion<6
 % override chrome://mozapps/skin/downloads/downloadIcon.png               chrome://mozapps/skin/downloads/downloadIcon-XP.png           osversion<6
+#ifdef MOZ_WEBEXTENSIONS
 % override chrome://mozapps/skin/extensions/category-discover.png         chrome://mozapps/skin/extensions/category-discover-XP.png     osversion<6
 % override chrome://mozapps/skin/extensions/category-plugins.png          chrome://mozapps/skin/extensions/category-plugins-XP.png      osversion<6
 % override chrome://mozapps/skin/extensions/category-recent.png           chrome://mozapps/skin/extensions/category-recent-XP.png       osversion<6
@@ -58,6 +63,7 @@ toolkit.jar:
 % override chrome://mozapps/skin/extensions/themeGeneric.png              chrome://mozapps/skin/extensions/themeGeneric-XP.png          osversion<6
 % override chrome://mozapps/skin/extensions/themeGeneric-16.png           chrome://mozapps/skin/extensions/themeGeneric-16-XP.png       osversion<6
 % override chrome://mozapps/skin/extensions/localeGeneric.png             chrome://mozapps/skin/extensions/localeGeneric-XP.png         osversion<6
+#endif
 % override chrome://mozapps/skin/plugins/pluginGeneric.png                chrome://mozapps/skin/plugins/pluginGeneric-XP.png            osversion<6
 % override chrome://mozapps/skin/plugins/pluginBlocked.png                chrome://mozapps/skin/plugins/pluginBlocked-XP.png            osversion<6
 % override chrome://mozapps/skin/plugins/pluginGeneric-16.png             chrome://mozapps/skin/plugins/pluginGeneric-16-XP.png         osversion<6
diff --git a/toolkit/themes/windows/mozapps/extensions/about.css b/toolkit/themes/windows/mozapps/webextensions/about.css
index 19eaddca86..19eaddca86 100644
--- a/toolkit/themes/windows/mozapps/extensions/about.css
+++ b/toolkit/themes/windows/mozapps/webextensions/about.css
diff --git a/toolkit/themes/windows/mozapps/extensions/blocklist.css b/toolkit/themes/windows/mozapps/webextensions/blocklist.css
index 1cdbb35ac6..1cdbb35ac6 100644
--- a/toolkit/themes/windows/mozapps/extensions/blocklist.css
+++ b/toolkit/themes/windows/mozapps/webextensions/blocklist.css
diff --git a/toolkit/themes/windows/mozapps/extensions/cancel.png b/toolkit/themes/windows/mozapps/webextensions/cancel.png
index 0d98ab2359..0d98ab2359 100644
--- a/toolkit/themes/windows/mozapps/extensions/cancel.png
+++ b/toolkit/themes/windows/mozapps/webextensions/cancel.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png
index d1b737ab05..d1b737ab05 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-available.png b/toolkit/themes/windows/mozapps/webextensions/category-available.png
index 9341f2aa7b..9341f2aa7b 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-available.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png
index a6f5b49b37..a6f5b49b37 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover.png b/toolkit/themes/windows/mozapps/webextensions/category-discover.png
index af954a6135..af954a6135 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png
index 5c4d8bf471..5c4d8bf471 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png
index 100a90307b..100a90307b 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png
index 7ecfc7d4c8..7ecfc7d4c8 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent.png b/toolkit/themes/windows/mozapps/webextensions/category-recent.png
index d651586465..d651586465 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-search.png b/toolkit/themes/windows/mozapps/webextensions/category-search.png
index 52e91a7cea..52e91a7cea 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-search.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-service.png b/toolkit/themes/windows/mozapps/webextensions/category-service.png
index 997c8541ca..997c8541ca 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-service.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png
index 37e2a5e4ce..37e2a5e4ce 100644
--- a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png
index b26bb7100c..b26bb7100c 100644
--- a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/discover-logo.png b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png
index cd50735a89..cd50735a89 100644
--- a/toolkit/themes/windows/mozapps/extensions/discover-logo.png
+++ b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png
diff --git a/toolkit/themes/windows/mozapps/extensions/eula.css b/toolkit/themes/windows/mozapps/webextensions/eula.css
index 05aeb3c1c4..05aeb3c1c4 100644
--- a/toolkit/themes/windows/mozapps/extensions/eula.css
+++ b/toolkit/themes/windows/mozapps/webextensions/eula.css
diff --git a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png
index a9d00545ef..a9d00545ef 100644
--- a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png
index 36e7689a30..36e7689a30 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png
index 2724b9e7c6..2724b9e7c6 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/webextensions/extensions.css
index 335a31bde9..7c4aed05e7 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 #header-utils-btn {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities");
diff --git a/toolkit/themes/windows/mozapps/extensions/heart.png b/toolkit/themes/windows/mozapps/webextensions/heart.png
index 655f4c4be7..655f4c4be7 100644
--- a/toolkit/themes/windows/mozapps/extensions/heart.png
+++ b/toolkit/themes/windows/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png
index 4d9ac5ad89..4d9ac5ad89 100644
--- a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png
index 623ba3a6a2..623ba3a6a2 100644
--- a/toolkit/themes/windows/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/newaddon.css b/toolkit/themes/windows/mozapps/webextensions/newaddon.css
index edfba0ef55..5856c08b54 100644
--- a/toolkit/themes/osx/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/windows/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/windows/mozapps/extensions/rating-not-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png
index 2761f19255..2761f19255 100644
--- a/toolkit/themes/windows/mozapps/extensions/rating-not-won.png
+++ b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png
diff --git a/toolkit/themes/windows/mozapps/extensions/rating-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-won.png
index 336dd8f6eb..336dd8f6eb 100644
--- a/toolkit/themes/windows/mozapps/extensions/rating-won.png
+++ b/toolkit/themes/windows/mozapps/webextensions/rating-won.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png
index 16d77a4a25..16d77a4a25 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png
index ff13ce37f7..ff13ce37f7 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png
index be645f76df..be645f76df 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png
index 9cea549dd8..9cea549dd8 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/update.css b/toolkit/themes/windows/mozapps/webextensions/update.css
index 0db1793303..0db1793303 100644
--- a/toolkit/themes/windows/mozapps/extensions/update.css
+++ b/toolkit/themes/windows/mozapps/webextensions/update.css
diff --git a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css
index 42db4cd4d7..42db4cd4d7 100644
--- a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css