1100 files changed, 133 insertions, 106 deletions

diff --git a/browser/experiments/test/xpcshell/xpcshell.ini b/browser/experiments/test/xpcshell/xpcshell.ini
index 5ea30976c..5921c9c47 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 e5b32e7b1..5a90652b8 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 74067580a..fe58d362e 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 4f9098966..4f9098966 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 f393cc906..f393cc906 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 99c940b33..99c940b33 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 10c0f81c3..10c0f81c3 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 1307cebb9..1307cebb9 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 bd5997a26..bd5997a26 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 6dd64a9c6..6dd64a9c6 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 c2d4ed90f..c2d4ed90f 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 6a7d17a16..6a7d17a16 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 d0b4e46ad..d0b4e46ad 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 c28cf6f49..e42f0de00 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 f3159137c..9501938ae 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 2b90bd053..2b90bd053 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 90e53b2ea..90e53b2ea 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 4c8af4828..4c8af4828 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 c5cb80091..c5cb80091 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 3f2a7a529..3f2a7a529 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 6830bc91f..6830bc91f 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 8a405c0ea..8a405c0ea 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 f739b018f..f739b018f 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 63f1db785..63f1db785 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 89f82b265..89f82b265 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 5dd41831d..5dd41831d 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 d34cbaf62..d34cbaf62 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 8dc4dfecd..8dc4dfecd 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 58a58b62d..58a58b62d 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 9c9197a61..9c9197a61 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 eed108097..eed108097 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 6c5ebca67..6c5ebca67 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 382791d32..382791d32 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 5ad0d23f1..5ad0d23f1 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 0bcc345e8..0bcc345e8 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 ad37989b8..ad37989b8 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 4f8fb353e..4f8fb353e 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 6effcf37a..6effcf37a 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 cb48005a2..cb48005a2 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 6d524e6ee..6d524e6ee 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 74474392f..74474392f 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 240d9e4e1..240d9e4e1 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 537ee7284..537ee7284 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 10e657951..10e657951 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 cb5313365..cb5313365 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 56158d9c6..56158d9c6 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 b49645cf0..b49645cf0 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 70939d024..70939d024 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 ea7ee92fa..ea7ee92fa 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 a31922703..a31922703 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 65efeb6a2..65efeb6a2 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 b1ad5631b..b1ad5631b 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 1d8545249..1d8545249 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 c3fdbfa5b..c3fdbfa5b 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 2b70eb0d0..2b70eb0d0 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 80d0fa688..80d0fa688 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 745983814..745983814 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 5fcccd6d7..5fcccd6d7 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 583facfec..583facfec 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 5660cdaaf..5660cdaaf 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 f1c29eb73..f1c29eb73 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 5146af84f..5146af84f 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 5f724e9ef..5f724e9ef 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 ab6ed3c70..ab6ed3c70 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 c7d2ee386..c7d2ee386 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 0eae2475c..0eae2475c 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 22d91fdf5..22d91fdf5 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 f05a6fe6c..f05a6fe6c 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 7f88d44ad..7f88d44ad 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 e3479643b..e3479643b 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 6422929b1..6422929b1 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 63c16737c..63c16737c 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 9f366ba32..9f366ba32 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 3bcee44d3..3bcee44d3 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 9bb34a7af..9bb34a7af 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 49dfa237f..49dfa237f 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 075159a9a..075159a9a 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 f98dd2a94..f98dd2a94 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 f4f557fc2..f4f557fc2 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 a920c2eae..a920c2eae 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 87e09cef1..87e09cef1 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 d04eb207c..d04eb207c 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 28c34f8c9..28c34f8c9 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 ecf64b7ef..ecf64b7ef 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 12640e115..12640e115 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 0af90430c..0af90430c 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 1752924b5..1752924b5 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 eb9a92195..eb9a92195 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 6c667ecab..6c667ecab 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 7b1b02a17..7b1b02a17 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 ae364637e..ae364637e 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 568c41a43..568c41a43 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 1281ab53f..1281ab53f 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 8b6dd09f5..8b6dd09f5 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 fade395f9..fade395f9 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 4a18f64e0..4a18f64e0 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 8a2519222..8a2519222 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 2c55e5ff7..2c55e5ff7 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 eebac4b21..eebac4b21 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 f37741d04..f37741d04 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 e15f99264..e15f99264 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 f4b70a24b..f4b70a24b 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 987204fa6..987204fa6 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 19ab4b9fe..19ab4b9fe 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 a3cd06f5f..a3cd06f5f 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 eeff9fb79..eeff9fb79 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 1d2650603..1d2650603 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 85d7108d6..85d7108d6 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 394fd909e..394fd909e 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 2a1fec25a..2a1fec25a 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 a5d5beb34..a5d5beb34 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 f11a626fd..f11a626fd 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 3a0ace227..3a0ace227 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 0184f1963..0184f1963 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 dbb1b7318..dbb1b7318 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 f50c65c6a..f50c65c6a 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 92cf3ec96..92cf3ec96 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 82cfd0472..82cfd0472 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 80776e6c3..80776e6c3 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 41409edfe..41409edfe 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 bade9c069..bade9c069 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 321ce47cf..321ce47cf 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 1666f2972..1666f2972 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 f02a3869c..f02a3869c 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 7fe60e632..7fe60e632 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 1666f2972..1666f2972 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 480f03fd1..480f03fd1 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 532741e12..532741e12 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 1666f2972..1666f2972 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 e9385cbb3..e9385cbb3 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 1b813faaf..1b813faaf 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 2b88e0ad0..2b88e0ad0 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 1666f2972..1666f2972 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 e0e8ca978..e0e8ca978 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 0e45caec4..0e45caec4 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 898282991..898282991 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 791a6263f..791a6263f 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 36d15b8aa..36d15b8aa 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 3521a503c..3521a503c 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 d92a4ec41..d92a4ec41 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 c3ad76b84..c3ad76b84 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 a937b6e76..a937b6e76 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 8afca3ff9..8afca3ff9 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 4c0dcc2ef..4c0dcc2ef 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 2b113809a..2b113809a 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 03eb7180e..03eb7180e 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 3ed7cd932..3ed7cd932 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 cacf824c1..cacf824c1 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 09954ec36..09954ec36 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 5e4a6f6a2..5e4a6f6a2 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 913233cec..913233cec 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 fd0dd50b7..fd0dd50b7 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 607b68357..607b68357 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 3a4c7eafc..3a4c7eafc 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 8557df116..8557df116 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 343a9d44c..343a9d44c 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 5a724cc99..5a724cc99 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 70fe81168..70fe81168 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 2aface3b4..2aface3b4 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 7804e833c..7804e833c 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 c60b5711b..c60b5711b 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 23faf5a34..23faf5a34 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 d44448208..d44448208 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 6ec052d36..6ec052d36 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 c60caf594..c60caf594 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 2e5ace760..2e5ace760 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 ae54424d1..ae54424d1 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 cfcfd406f..cfcfd406f 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 e4e1b339b..e4e1b339b 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 5397e8a87..5397e8a87 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 b1dde7f7a..b1dde7f7a 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 ae483434a..ae483434a 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 97abacc5e..97abacc5e 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 bff1104a7..bff1104a7 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 444bdc556..444bdc556 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 f97bd1302..f97bd1302 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 09c083532..09c083532 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 1e13ceb87..1e13ceb87 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 83220ce06..83220ce06 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 d2277257f..d2277257f 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 e69de29bb..e69de29bb 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 ba23ab802..ba23ab802 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 07afddfa7..07afddfa7 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 682831949..682831949 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 36c03fd00..36c03fd00 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 a3fa0d707..a3fa0d707 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 b79648e89..b79648e89 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 71827885f..71827885f 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 3b34c63d3..3b34c63d3 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 17d5c99ec..17d5c99ec 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 ca2881e5a..ca2881e5a 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 b942a8064..b942a8064 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 6703e7f7d..6703e7f7d 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 b2316273f..b2316273f 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 2ad481453..2ad481453 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 ff4d613ef..ff4d613ef 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 be8d85b1b..be8d85b1b 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 5e64b65c1..5e64b65c1 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 7728002ea..7728002ea 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 4d63b6b06..4d63b6b06 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 486be8670..486be8670 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 3b0195077..3b0195077 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 9a9ee4823..9a9ee4823 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 73190ed8f..73190ed8f 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 b4a40052f..b4a40052f 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 3a4a709e0..3a4a709e0 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 60d4f01f0..60d4f01f0 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 1e0aea440..1e0aea440 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 73d58dd66..73d58dd66 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 463e3f27e..463e3f27e 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 b0aa32adc..b0aa32adc 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 7836bced8..7836bced8 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 4ebb75c30..4ebb75c30 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 5d94de0ea..5d94de0ea 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 aebfe3b68..aebfe3b68 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 e1f2b5173..e1f2b5173 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 da9b067ab..da9b067ab 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 c5a80c7b9..c5a80c7b9 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 3ebbe16b0..3ebbe16b0 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 1a98f4660..1a98f4660 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 dea028488..dea028488 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 75c7666bb..75c7666bb 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 9561979dc..9561979dc 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 fb8fc9540..fb8fc9540 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 aec4b202e..aec4b202e 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 d9200ec11..d9200ec11 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 c945c928c..c945c928c 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 3feac546d..3feac546d 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 9e66ab237..9e66ab237 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 b35b9c1a6..b35b9c1a6 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 a74a114fd..a74a114fd 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 c056e87ff..c056e87ff 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 7470284ba..7470284ba 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 11eba90d7..11eba90d7 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 8bd5966c9..8bd5966c9 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 1666f2972..1666f2972 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 414a36b30..414a36b30 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 5e64b65c1..5e64b65c1 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 40765b0e2..40765b0e2 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 8d2740dbb..8d2740dbb 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 a28d18162..a28d18162 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 7fcc1a09e..7fcc1a09e 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 fd843dbe9..fd843dbe9 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 41409edfe..41409edfe 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 41409edfe..41409edfe 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 efe3f18ae..efe3f18ae 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 41409edfe..41409edfe 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 116eb7069..116eb7069 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 7197ea1fb..7197ea1fb 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 8e72017ad..8e72017ad 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 e57a4f5b6..e57a4f5b6 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 93fbfbe6e..93fbfbe6e 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 3613dab04..3613dab04 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 1af178887..1af178887 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 33695b99f..33695b99f 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 33695b99f..33695b99f 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 57f2c2eb6..57f2c2eb6 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 5e99ae29a..5e99ae29a 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 703adf2a7..703adf2a7 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 1f96e4b49..1f96e4b49 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 b1f97c1fd..b1f97c1fd 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 9c283d1d4..9c283d1d4 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 9c283d1d4..9c283d1d4 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 5e99ae29a..5e99ae29a 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 5e99ae29a..5e99ae29a 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 2449baeb8..2449baeb8 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 9e26dfeeb..9e26dfeeb 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 e88794a60..e88794a60 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 16fe819a2..16fe819a2 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 056f6dff5..056f6dff5 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 d8d027b93..d8d027b93 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 09655c2a6..09655c2a6 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 75f110d2a..75f110d2a 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 5924982f7..5924982f7 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 072751cf2..072751cf2 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 ff8280ae3..ff8280ae3 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 fd1df0e08..fd1df0e08 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 8570bae82..8570bae82 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 61ed24763..61ed24763 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 116dd0176..116dd0176 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 4eb8b4875..4eb8b4875 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 adccda552..adccda552 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 e1a37d0a4..e1a37d0a4 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 321ce47cf..321ce47cf 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 1666f2972..1666f2972 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 b038ebc51..b038ebc51 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 1666f2972..1666f2972 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 4178fe929..4178fe929 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 801a35a8f..801a35a8f 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 3589cb55c..3589cb55c 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 43e31af42..43e31af42 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 24c778c09..24c778c09 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 9f955562c..9f955562c 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 febff06fa..febff06fa 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 44bdb05ba..44bdb05ba 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 24c778c09..24c778c09 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 803b64e5f..803b64e5f 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 24c778c09..24c778c09 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 041af57f0..041af57f0 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 76e662977..76e662977 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 e57672c42..e57672c42 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 16108ce18..16108ce18 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 2ca5f40f7..2ca5f40f7 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 653481ed0..653481ed0 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 5b470d430..5b470d430 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 36868d414..36868d414 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 c3d02ffde..c3d02ffde 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 b6ae6f10f..b6ae6f10f 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 2852eb81d..2852eb81d 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 c2b8b935e..c2b8b935e 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 85cfe6b2d..85cfe6b2d 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 d13e5d66e..d13e5d66e 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 5199c2f3f..5199c2f3f 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 e1d6ac586..e1d6ac586 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 c061814b6..c061814b6 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 1380e7b5b..1380e7b5b 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 1be5422b2..1be5422b2 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 46326b04c..46326b04c 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 54887a30e..54887a30e 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 95de79b79..95de79b79 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 79946b0f0..79946b0f0 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 005d7ef21..005d7ef21 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 067af1ba1..067af1ba1 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 89f751a03..89f751a03 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 37d7e6a7c..37d7e6a7c 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 77de37c2a..77de37c2a 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 461facbb2..461facbb2 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 666ae0910..666ae0910 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 2111b9c64..2111b9c64 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 ad9367dc1..ad9367dc1 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 032e9adaf..032e9adaf 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 20ae35539..20ae35539 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 d9f0ca745..d9f0ca745 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 3c99022cf..3c99022cf 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 8809ffb58..8809ffb58 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 c438cbd0b..c438cbd0b 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 c768d7881..c768d7881 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 a87191efe..a87191efe 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 bed489c3e..bed489c3e 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 d8b4d083c..d8b4d083c 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 9bcd43e87..9bcd43e87 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 e4441cb19..e4441cb19 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 4789abfaf..4789abfaf 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 1c2b793f1..1c2b793f1 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 92f20a4ef..92f20a4ef 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 be453ce9c..be453ce9c 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 7871af738..7871af738 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 8884e3974..8884e3974 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 18fcec167..18fcec167 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 cd4f72387..cd4f72387 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 6864a3d5a..6864a3d5a 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 6e937c5cc..6e937c5cc 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 6ac72a03c..6ac72a03c 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 7871af738..7871af738 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 f1eaef1d0..f1eaef1d0 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 a04046a74..a04046a74 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 148fb9856..148fb9856 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 0b2dcc8fe..0b2dcc8fe 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 4c939c05b..4c939c05b 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 7871af738..7871af738 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 ba90bd57b..ba90bd57b 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 095d3bcef..095d3bcef 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 d6df8f9d0..d6df8f9d0 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 b11b6d7e4..b11b6d7e4 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 5468e6cb0..5468e6cb0 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 81898b24d..81898b24d 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 999535a97..999535a97 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 7ce6cd09a..7ce6cd09a 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 efef815aa..efef815aa 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 7b86e419a..7b86e419a 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 02cc935ea..02cc935ea 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 956812aaa..956812aaa 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 ff5b80ae8..ff5b80ae8 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 f1a7ccee1..f1a7ccee1 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 f4674b840..f4674b840 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 c52307b4a..c52307b4a 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 7ef3db940..7ef3db940 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 ff5b80ae8..ff5b80ae8 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 f1a7ccee1..f1a7ccee1 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 e35092a55..e35092a55 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 2fae190b4..2fae190b4 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 4fa7b8bfa..4fa7b8bfa 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 bd11077c2..bd11077c2 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 2cae124e1..2cae124e1 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 a063fd1c4..a063fd1c4 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 e808cd5ab..e808cd5ab 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 ea804601b..ea804601b 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 e4e191b37..e4e191b37 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 24eb5bc6f..24eb5bc6f 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 eda266e2f..eda266e2f 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 fcda90fc6..fcda90fc6 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 a23841d33..a23841d33 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 dd2992f81..dd2992f81 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 f781cf146..f781cf146 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 879d7331e..879d7331e 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 e61fafd6b..e61fafd6b 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 94a8b6f49..94a8b6f49 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 136e7cb74..136e7cb74 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 c72eb9363..c72eb9363 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 c32ed3062..c32ed3062 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 e99f3c3bd..e99f3c3bd 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 23686b608..23686b608 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 55e882a05..55e882a05 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 53e890b71..53e890b71 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 ccb12c489..ccb12c489 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 9807be98f..9807be98f 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 1cd4d90cd..1cd4d90cd 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 1d9a75416..1d9a75416 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 bb9b9a894..bb9b9a894 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 0606a9a31..0606a9a31 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 69102060e..69102060e 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 6554451fb..6554451fb 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 913b3b954..913b3b954 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 d3d338203..d3d338203 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 b02a6cc3e..b02a6cc3e 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 fb5ebf01b..fb5ebf01b 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 ef05ba4ea..ef05ba4ea 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 f805f0e19..f805f0e19 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 f759ffc1f..f759ffc1f 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 9c2e102e7..9c2e102e7 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 4a4f735af..4a4f735af 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 fd23d0036..fd23d0036 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 411d9f383..411d9f383 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 ec32e376f..ec32e376f 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 72bb61f49..72bb61f49 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 58de88130..58de88130 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 3cf6f5346..3cf6f5346 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 5bcc6baf1..5bcc6baf1 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 e1ec605c2..e1ec605c2 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 b9a7faa5e..b9a7faa5e 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 e7c672212..e7c672212 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 6c42e0126..6c42e0126 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 ce4c51b5a..ce4c51b5a 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 ec336df2d..ec336df2d 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 63516bd53..63516bd53 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 960e7e933..960e7e933 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 befe9f1f2..befe9f1f2 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 965ab8a0b..965ab8a0b 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 18a548de5..18a548de5 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 663905a90..663905a90 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 52079a263..52079a263 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 b7bb3f580..b7bb3f580 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 e2814ddf4..e2814ddf4 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 5a704530a..5a704530a 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 ecd10852d..ecd10852d 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 ce618b7fa..ce618b7fa 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 880a4624d..880a4624d 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 437bf9b85..437bf9b85 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 2e4f8163b..2e4f8163b 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 0643c811a..0643c811a 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 de3c90353..de3c90353 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 b0726ef9e..b0726ef9e 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 49427329f..49427329f 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 0c5eb2da6..0c5eb2da6 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 98be4b7f8..98be4b7f8 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 d450828ba..d450828ba 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 f95365a4c..f95365a4c 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 a9c7be4bc..a9c7be4bc 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 458e8e334..458e8e334 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 a815d10d5..a815d10d5 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 9d4b18880..9d4b18880 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 02007dbbf..02007dbbf 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 907d9b105..907d9b105 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 a3537b269..a3537b269 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 24f6cb89f..24f6cb89f 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 b57e7a6f7..b57e7a6f7 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 2bb6b4ba4..2bb6b4ba4 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 37ab76542..37ab76542 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 2838698c7..2838698c7 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 5ff2aff78..5ff2aff78 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 8abb0ff73..8abb0ff73 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 a9329e496..a9329e496 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 09ceb1240..09ceb1240 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 0fe3eeec5..0fe3eeec5 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 8b816c927..8b816c927 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 f24573847..f24573847 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 2e4f8163b..2e4f8163b 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 ca8e41aad..ca8e41aad 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 f4b1dc745..f4b1dc745 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 b8049f13c..b8049f13c 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 27d8029c5..27d8029c5 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 bc31c2331..bc31c2331 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 724f6fefe..724f6fefe 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 b13213f0b..b13213f0b 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 38bc25d08..38bc25d08 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 72f4fe374..72f4fe374 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 8ec722812..8ec722812 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 c6499ec03..c6499ec03 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 5a749099d..5a749099d 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 28dbb0a2e..28dbb0a2e 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 af04aaeef..af04aaeef 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 1b6827915..1b6827915 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 0709eda06..0709eda06 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 8f9d1c08a..8f9d1c08a 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 63ae07901..63ae07901 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 39bd936c9..39bd936c9 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 bd1890573..bd1890573 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 2b4ba9362..2b4ba9362 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 f2d475bd2..f2d475bd2 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 56128fd9c..56128fd9c 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 141f09cc6..141f09cc6 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 76e642604..76e642604 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 146769978..146769978 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 ba3653310..ba3653310 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 383da0f41..383da0f41 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 e215cffad..e215cffad 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 b6c8a53b4..b6c8a53b4 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 b14cfe87a..b14cfe87a 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 d13e6ef2f..d13e6ef2f 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 8f99ea73a..8f99ea73a 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 535799b27..535799b27 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 716659198..716659198 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 ba65517f9..ba65517f9 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 7c1e4aa9d..7c1e4aa9d 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 a229a653a..a229a653a 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 588290968..588290968 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 5c3747f5f..5c3747f5f 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 d60708414..d60708414 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 85a66fe55..85a66fe55 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 87011cd39..87011cd39 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 867a34255..867a34255 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 df9276525..df9276525 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 1f673ef2f..1f673ef2f 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 88d22f281..88d22f281 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 daba6f4c1..daba6f4c1 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 232fd0d07..232fd0d07 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 35d7bd5e5..35d7bd5e5 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 0c30989aa..0c30989aa 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 74ed2b817..74ed2b817 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 1666f2972..1666f2972 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 f02a3869c..f02a3869c 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 75e252a46..75e252a46 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 f17f98b15..f17f98b15 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 0e3d415c4..0e3d415c4 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 55ad1c7d5..55ad1c7d5 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 42cb20bd0..42cb20bd0 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 e1da86fa5..e1da86fa5 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 8c9501478..8c9501478 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 51b00475a..51b00475a 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 0cf01d319..0cf01d319 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 9d08c357c..9d08c357c 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 11686f61c..11686f61c 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 718c82be4..718c82be4 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 0a345dd92..0a345dd92 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 11686f61c..11686f61c 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 9d6f0c708..9d6f0c708 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 4496a90cf..4496a90cf 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 e61e3c721..e61e3c721 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 1682a7506..1682a7506 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 cd67e25fc..cd67e25fc 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 e4040a274..e4040a274 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 ca453b9d5..ca453b9d5 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 69579d2dc..69579d2dc 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 6e23eb214..6e23eb214 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 0ba0f30d1..0ba0f30d1 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 33101f63c..33101f63c 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 3146870d8..3146870d8 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 97ae60988..97ae60988 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 11686f61c..11686f61c 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 df2fd8081..df2fd8081 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 11686f61c..11686f61c 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 ec38fcc65..ec38fcc65 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 fc2842399..fc2842399 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 327c8a187..327c8a187 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 efad21d1b..efad21d1b 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 d6ddbcec3..d6ddbcec3 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 5898d83e4..5898d83e4 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 9d50f0825..9d50f0825 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 6ba1efd72..6ba1efd72 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 1666f2972..1666f2972 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 2fc2fd189..2fc2fd189 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 e7e50c8ea..e7e50c8ea 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 a858cf74a..a858cf74a 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 911632e49..911632e49 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 102a053bb..102a053bb 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 295e77611..295e77611 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 954995619..954995619 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 dc8632aef..dc8632aef 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 3f818172a..3f818172a 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 1f70b1a75..1f70b1a75 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 fc636e97f..fc636e97f 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 ff620966d..ff620966d 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 e474dbd59..e474dbd59 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 1ccde90c5..1ccde90c5 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 94d9e47d2..94d9e47d2 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 28c8561c6..28c8561c6 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 daf55c0d4..daf55c0d4 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 75cacbbc8..75cacbbc8 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 2eb6b7fc9..2eb6b7fc9 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 fb588b3e0..fb588b3e0 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 7a5eb265d..7a5eb265d 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 dc6749355..dc6749355 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 3c673ac2e..3c673ac2e 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 0bebca2c1..0bebca2c1 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 f707f1217..f707f1217 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 003095727..003095727 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 fec8b09ca..fec8b09ca 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 f99256b87..f99256b87 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 4cd5c1443..4cd5c1443 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 d02fa0249..d02fa0249 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 8a6167969..8a6167969 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 ab7cdef34..ab7cdef34 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 368a6ed53..368a6ed53 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 41df457b0..41df457b0 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 20035c6a2..20035c6a2 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 d60d8ca3f..d60d8ca3f 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 94a4ea450..94a4ea450 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 2c453f756..2c453f756 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 1767b4332..1767b4332 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 94e12527f..94e12527f 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 d797debbb..d797debbb 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 f12ca1fa6..f12ca1fa6 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 ad8ec5ed9..ad8ec5ed9 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 85f0da57c..85f0da57c 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 5397e8a87..5397e8a87 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 b1dde7f7a..b1dde7f7a 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 ae483434a..ae483434a 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 97abacc5e..97abacc5e 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 bff1104a7..bff1104a7 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 e4ad91ae9..e4ad91ae9 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 10fcafd39..10fcafd39 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 684002462..684002462 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 6e7116239..6e7116239 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 c926af934..c926af934 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 c4cc2fe37..c4cc2fe37 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 cc0a0c69d..cc0a0c69d 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 0261794f8..0261794f8 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 d651f8799..d651f8799 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 208444681..208444681 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 2dbcc0b50..2dbcc0b50 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 86fc6baaa..86fc6baaa 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 adb7be9ad..adb7be9ad 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 db82cf675..db82cf675 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 736c10514..736c10514 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 f2511c0de..f2511c0de 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 9857dcb55..9857dcb55 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 c0d67d033..c0d67d033 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 f3341bdcf..f3341bdcf 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 a81c90bf0..a81c90bf0 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 25ffd8565..25ffd8565 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 7693c9c2d..7693c9c2d 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 cf3defdc7..cf3defdc7 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 8af39cb0e..8af39cb0e 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 2fcab10b5..2fcab10b5 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 d44d4880f..d44d4880f 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 b7f48149d..b7f48149d 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 866884f8d..866884f8d 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 364b3bba1..364b3bba1 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 01682d3b7..01682d3b7 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 ebe547ccc..ebe547ccc 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 051aef85a..051aef85a 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 9eddc4493..9eddc4493 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 d535d2c3f..d535d2c3f 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 0ad8f6819..0ad8f6819 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 f64676355..f64676355 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 248868a2e..248868a2e 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 016726021..016726021 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 35a2befee..35a2befee 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 7180da143..7180da143 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 fe82334fa..fe82334fa 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 33f14a2fd..33f14a2fd 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 d1dc992d5..d1dc992d5 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 a3bf4f8ae..a3bf4f8ae 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 2773c7f98..2773c7f98 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 699257f87..699257f87 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 8cbfb5d6a..8cbfb5d6a 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 75bd6e934..75bd6e934 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 d3564aebd..d3564aebd 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 7cd8496b3..7cd8496b3 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 1666f2972..1666f2972 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 a1d18470c..a1d18470c 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 949288e3f..949288e3f 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 1666f2972..1666f2972 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 027a9b233..027a9b233 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 4d4640f60..4d4640f60 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 62928815b..62928815b 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 f28a3f26d..f28a3f26d 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 811e50158..811e50158 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 c5d97ada0..c5d97ada0 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 ec6e88ec4..ec6e88ec4 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 2ef88860e..2ef88860e 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 2f72c181d..2f72c181d 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 c13928520..c13928520 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 51b00475a..51b00475a 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 6b4abaa69..6b4abaa69 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 960caceeb..960caceeb 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 6310bbc60..6310bbc60 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 dd0dc1981..dd0dc1981 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 203235940..203235940 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 6aec96ea1..6aec96ea1 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 605c4224b..605c4224b 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 2a6ff291e..2a6ff291e 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 61a46b251..61a46b251 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 6c562db65..6c562db65 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 99ab8ab13..99ab8ab13 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 d733778a5..d733778a5 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 56ce3c614..56ce3c614 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 38e563979..38e563979 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 3890b76e1..3890b76e1 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 d3ccf68f3..d3ccf68f3 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 6ebf088d6..6ebf088d6 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 cbcd5cb7e..cbcd5cb7e 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 5befa6fa0..5befa6fa0 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 41ef62f98..41ef62f98 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 c89ccdef8..c89ccdef8 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 d065f700d..d065f700d 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 ff58599bc..ff58599bc 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 101d49510..101d49510 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 29b538d21..29b538d21 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 7b7883225..7b7883225 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 c13531dff..c13531dff 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 8e9f30ef2..8e9f30ef2 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 66656abe6..66656abe6 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 c183edad4..c183edad4 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 84b6c6189..84b6c6189 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 251bdca70..251bdca70 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 43656f126..43656f126 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 aeaaf3d8f..aeaaf3d8f 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 ebc330cdd..ebc330cdd 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 bd393b91c..bd393b91c 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 aa18a6946..aa18a6946 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 e22ab87c9..e22ab87c9 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 8b29e15a5..8b29e15a5 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 f11a942fb..f11a942fb 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 e13f36a7c..e13f36a7c 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 1512a7f92..1512a7f92 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 06e29b376..06e29b376 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 e8e2353e2..e8e2353e2 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 01c976a17..01c976a17 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 920c3731a..920c3731a 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 6fa11eb39..6fa11eb39 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 0c912ceff..0c912ceff 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 0d1d30f3b..0d1d30f3b 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 100ea99d7..100ea99d7 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 c51c38b0c..c51c38b0c 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 46b65ffff..46b65ffff 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 261739da4..261739da4 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 634361991..634361991 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 b507fc100..b507fc100 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 debf59172..debf59172 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 b7af5453f..b7af5453f 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 aa1bbd53f..aa1bbd53f 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 c252e1ced..c252e1ced 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 866ad3ad7..866ad3ad7 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 497e66526..497e66526 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 92ba3d68f..92ba3d68f 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 641ff87c9..641ff87c9 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 0e7863068..0e7863068 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 4869fc117..4869fc117 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 2c87d8c79..2c87d8c79 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 df64e159d..df64e159d 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 8d9857e7f..8d9857e7f 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 858579815..858579815 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 db53dc747..db53dc747 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 7e2bf7d77..7e2bf7d77 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 bdcf93a1f..bdcf93a1f 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 d0c973960..d0c973960 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 1c21385e0..1c21385e0 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 6bfbfcaf2..6bfbfcaf2 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 449c59065..449c59065 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 6e98a69a4..6e98a69a4 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 6f2a5e7cd..6f2a5e7cd 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 d17e7acde..d17e7acde 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 206862339..206862339 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 54cee0839..54cee0839 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 a7acb9ad2..a7acb9ad2 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 edb442aad..edb442aad 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 f3448abd2..f3448abd2 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 b6cb13e08..b6cb13e08 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 b9fc0b3ab..b9fc0b3ab 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 a6c635eac..a6c635eac 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 c079534c3..c079534c3 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 210c6a936..210c6a936 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 622973472..622973472 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 92b375850..92b375850 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 bf75818e9..bf75818e9 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 1b61e033a..1b61e033a 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 3d7eef051..3d7eef051 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 cdfac8f8c..cdfac8f8c 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 3afc03f84..3afc03f84 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 f4b6a0535..f4b6a0535 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 867715863..867715863 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 720b454cc..720b454cc 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 b408cc9c7..b408cc9c7 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 4d1848ea4..4d1848ea4 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 1a3a0e747..1a3a0e747 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 11a465b55..11a465b55 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 3dcd83da8..3dcd83da8 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 a3b3f477c..a3b3f477c 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 406489e40..406489e40 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 0c3035f76..0c3035f76 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 e69b13314..e69b13314 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 c83638d54..c83638d54 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 9b0eb54a7..9b0eb54a7 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 f8b783ff2..f8b783ff2 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 1b3410e87..1b3410e87 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 248c9e7f6..248c9e7f6 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 8b8928bb8..8b8928bb8 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 bd5858023..bd5858023 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 b5c5ed2a6..b5c5ed2a6 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 ff37e6676..ff37e6676 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 72b2a2bdc..72b2a2bdc 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 fa0deb19a..fa0deb19a 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 f01329b45..f01329b45 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 4b1069dc6..4b1069dc6 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 0c5a0dcb7..0c5a0dcb7 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 868c48149..868c48149 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 48174b772..48174b772 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 fbb992879..fbb992879 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 545d7d666..545d7d666 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 925e63626..925e63626 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 c9303897f..c9303897f 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 42ee59740..42ee59740 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 60af3a9fd..60af3a9fd 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 18bb7d74e..18bb7d74e 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 70f91c560..70f91c560 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 77f806ba2..77f806ba2 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 87f2856b0..87f2856b0 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 6222398a7..6222398a7 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 adf789afb..adf789afb 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 a97a14d4d..a97a14d4d 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 b4c7311e5..b4c7311e5 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 86457eab1..86457eab1 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 4a62c585f..4a62c585f 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 9e17b4c8b..9e17b4c8b 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 85279ba5d..85279ba5d 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 1dd05064e..1dd05064e 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 dbf5db485..dbf5db485 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 8c13593b9..8c13593b9 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 cc7336713..cc7336713 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 71bd66603..71bd66603 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 fad015886..fad015886 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 885cd5a7c..885cd5a7c 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 d9cfc8790..d9cfc8790 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 171ac411e..171ac411e 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 4cd103fa6..4cd103fa6 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 a2ea5301e..a2ea5301e 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 2d11e9c5b..2d11e9c5b 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 f9b7da073..f9b7da073 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 c39e432bd..c39e432bd 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 657601e45..657601e45 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 48fef406f..48fef406f 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 576f04a65..576f04a65 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 563b7434c..563b7434c 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 e5acb28a4..e5acb28a4 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 05e17b35e..05e17b35e 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 3f0ac7ebe..3f0ac7ebe 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 c6a10e7c1..c6a10e7c1 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 228eb7d34..228eb7d34 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 d210eb81d..d210eb81d 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 f90e38292..f90e38292 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 1193ddfe4..1193ddfe4 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 7b28c78f2..7b28c78f2 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 c35870c9b..c35870c9b 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 eab7af6b6..eab7af6b6 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 5873d1980..5873d1980 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 05647f807..05647f807 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 3d386f663..3d386f663 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 e499e7339..e499e7339 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 43ee18594..43ee18594 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 725887bc1..725887bc1 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 3b96f40ba..3b96f40ba 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 19b07ac16..19b07ac16 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 b74d7804a..b74d7804a 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 97e2ff79f..97e2ff79f 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 01de29088..01de29088 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 eb1bb78b3..eb1bb78b3 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 0b5b30d89..0b5b30d89 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 260b536e1..260b536e1 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 db5e4f7cc..db5e4f7cc 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 fdd00c1ad..fdd00c1ad 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 cb6704936..cb6704936 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 552d7cfae..552d7cfae 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 385f58405..385f58405 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 35964c663..35964c663 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 31b7e5783..31b7e5783 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 c8e314427..c8e314427 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 ef4f2aee5..ef4f2aee5 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 ec9e25a0b..ec9e25a0b 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 84d6f1d0d..84d6f1d0d 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 679f4808c..679f4808c 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 36ca95aec..36ca95aec 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 4680a3c4a..4680a3c4a 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 6b12489f2..6b12489f2 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 4db488ab5..4db488ab5 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 b50fd4a55..b50fd4a55 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 a1d872009..a1d872009 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 e899619d6..e899619d6 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 2b1f65a9f..2b1f65a9f 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 ff5d5d321..ff5d5d321 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 e8529bb2c..e8529bb2c 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 f7e3e21e5..f7e3e21e5 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 dc3d9438a..dc3d9438a 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 c2203d097..c2203d097 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 b51f47977..b51f47977 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 3bd8a2bd8..3bd8a2bd8 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 25fb4115f..25fb4115f 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 1e7c9d9b7..1e7c9d9b7 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 29a3dacf7..29a3dacf7 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 1e86e5861..1e86e5861 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 42a0ca1ca..42a0ca1ca 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 2b95eb158..2b95eb158 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 2852eb81d..2852eb81d 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 4edf91e34..4edf91e34 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 74e877f26..74e877f26 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 85d448e2b..85d448e2b 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 5627f47a2..5627f47a2 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 d61ef7362..d61ef7362 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 66564afaa..66564afaa 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 f6c39b7bb..f6c39b7bb 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 1bfa7696f..1bfa7696f 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 80942a9f4..80942a9f4 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 4973a1b35..4973a1b35 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 a3157961d..a3157961d 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 b4b1110b0..b4b1110b0 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 7137df318..7137df318 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 9a26a77e4..9a26a77e4 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 a9de9e4f0..a9de9e4f0 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 4e7e20717..4e7e20717 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 4f3cd087f..4f3cd087f 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 0d96e7cbe..0d96e7cbe 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 f32d2c9d2..f32d2c9d2 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 81d89c025..81d89c025 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 e30d7a0e5..e30d7a0e5 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 bf919d89c..bf919d89c 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 541ac8333..541ac8333 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 1ef2b482f..1ef2b482f 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 833562d15..833562d15 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 792146c64..792146c64 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 bd4d27fb0..bd4d27fb0 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 a8bdbde39..a8bdbde39 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 64ca5e6b9..64ca5e6b9 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 adbec9499..adbec9499 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 cc1b8a8b2..cc1b8a8b2 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 15bad4ba9..15bad4ba9 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 4c45bd184..4c45bd184 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 4c8e262c7..4c8e262c7 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 6a1222797..6a1222797 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 2d930d221..2d930d221 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 5f3ef23ca..5f3ef23ca 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 3983662af..3983662af 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 407158e4f..407158e4f 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 5e1da8175..5e1da8175 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 2380a4df2..2380a4df2 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 997f386a6..997f386a6 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 b0e3ffc42..b0e3ffc42 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 891b85ebc..891b85ebc 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 5203c3153..5203c3153 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 d022d713a..d022d713a 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 f092edb8c..f092edb8c 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 a41662e1e..a41662e1e 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 3948d5649..3948d5649 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 61844c5a1..61844c5a1 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 eb4ac391f..eb4ac391f 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 3599f47d1..3599f47d1 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 7341f3082..7341f3082 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 9dda1aaeb..9dda1aaeb 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 5c3f79045..5c3f79045 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 fc798d66a..fc798d66a 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 8f1ae2d87..8f1ae2d87 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 d5fa9ae01..d5fa9ae01 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 33cda6e4c..33cda6e4c 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 16e20f3e9..16e20f3e9 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 9bbb59400..9bbb59400 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 9c0543602..9c0543602 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 006879439..006879439 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 b9df6615e..b9df6615e 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 b0875fc99..b0875fc99 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 e103dffd3..e103dffd3 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 ad3d645f5..ad3d645f5 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 fd9e944e8..fd9e944e8 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 6f4306df6..6f4306df6 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 e4c47cda5..e4c47cda5 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 0a9333430..0a9333430 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 555f1e2fc..555f1e2fc 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 96c60ac9e..96c60ac9e 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 286046d25..286046d25 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 198207d4b..198207d4b 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 8334c37c2..8334c37c2 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 780409257..780409257 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 92bccd9ec..92bccd9ec 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 35d7bd5e5..35d7bd5e5 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 74ed2b817..74ed2b817 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 370cde8fb..370cde8fb 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 324a092a3..324a092a3 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 197fe3fac..197fe3fac 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 262ed38a7..262ed38a7 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 6abee2ef3..6abee2ef3 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 65cab1ef1..65cab1ef1 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 2b302642e..2b302642e 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 d52f28c28..d52f28c28 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 5a6903eb9..5a6903eb9 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 d248bfbc7..d248bfbc7 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 8e76bd052..8e76bd052 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 9fee8f60b..9fee8f60b 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 11fbe1861..11fbe1861 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 90d3a3ce6..90d3a3ce6 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 19b754038..19b754038 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 8c951881e..8c951881e 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 09789d189..09789d189 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 bd7f78b7c..bd7f78b7c 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 085efbbf7..085efbbf7 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 5f767a8f4..5f767a8f4 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 50083ca90..50083ca90 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 74e650b4a..74e650b4a 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 42e0e1cd0..42e0e1cd0 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 51b00475a..51b00475a 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 8d1c12305..0965662bd 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 689d526c9..689d526c9 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 ccea27524..ccea27524 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 b253dd08f..b253dd08f 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 9039b27aa..9039b27aa 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 52e91a7ce..52e91a7ce 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 997c8541c..997c8541c 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 08a0447a4..08a0447a4 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 a1e0d5359..a1e0d5359 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 b1a2f3652..b1a2f3652 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 a75669937..5a11df119 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 655f4c4be..655f4c4be 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 c72115906..c72115906 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 edfba0ef5..5856c08b5 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 019886fea..019886fea 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 cde1c7834..cde1c7834 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 3f5717073..8da83da16 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 c13ce5f59..c13ce5f59 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 02f6e1d49..02f6e1d49 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 0d98ab235..0d98ab235 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 d1b737ab0..d1b737ab0 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 54ae4f93f..54ae4f93f 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 a6f5b49b3..a6f5b49b3 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 a9d00545e..a9d00545e 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 5c4d8bf47..5c4d8bf47 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 7ecfc7d4c..7ecfc7d4c 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 52e91a7ce..52e91a7ce 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 997c8541c..997c8541c 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 4ad1a1a82..4ad1a1a82 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 54ae4f93f..54ae4f93f 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 cd50735a8..cd50735a8 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 05aeb3c1c..05aeb3c1c 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 a9d00545e..a9d00545e 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 fc6c8a258..fc6c8a258 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 d4dac2f01..cbdd9a5b0 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 655f4c4be..655f4c4be 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 4d9ac5ad8..4d9ac5ad8 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 edfba0ef5..5856c08b5 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 2761f1925..2761f1925 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 336dd8f6e..336dd8f6e 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 93196dbbf..93196dbbf 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 190bb30d7..190bb30d7 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 be645f76d..be645f76d 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 e7674c62a..e7674c62a 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 a0a016868..a0a016868 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 48af7c1a9..48af7c1a9 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 bb43fd4d2..fadd203b0 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 859f1ba4a..a783bbb3c 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 cb883e16e..cb883e16e 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 733f8571a..733f8571a 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 031190bce..031190bce 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 2b403220e..2b403220e 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 28c2f7ba3..28c2f7ba3 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 c4523bbe6..c4523bbe6 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 67ff3d9a7..67ff3d9a7 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 52352ccd2..52352ccd2 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 8bf24458c..8bf24458c 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 901e93e4e..b5907d016 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 19eaddca8..19eaddca8 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 1cdbb35ac..1cdbb35ac 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 0d98ab235..0d98ab235 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 d1b737ab0..d1b737ab0 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 9341f2aa7..9341f2aa7 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 a6f5b49b3..a6f5b49b3 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 af954a613..af954a613 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 5c4d8bf47..5c4d8bf47 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 100a90307..100a90307 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 7ecfc7d4c..7ecfc7d4c 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 d65158646..d65158646 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 52e91a7ce..52e91a7ce 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 997c8541c..997c8541c 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 37e2a5e4c..37e2a5e4c 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 b26bb7100..b26bb7100 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 cd50735a8..cd50735a8 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 05aeb3c1c..05aeb3c1c 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 a9d00545e..a9d00545e 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 36e7689a3..36e7689a3 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 2724b9e7c..2724b9e7c 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 335a31bde..7c4aed05e 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 655f4c4be..655f4c4be 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 4d9ac5ad8..4d9ac5ad8 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 623ba3a6a..623ba3a6a 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 edfba0ef5..5856c08b5 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 2761f1925..2761f1925 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 336dd8f6e..336dd8f6e 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 16d77a4a2..16d77a4a2 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 ff13ce37f..ff13ce37f 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 be645f76d..be645f76d 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 9cea549dd..9cea549dd 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 0db179330..0db179330 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 42db4cd4d..42db4cd4d 100644
--- a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css