242 files changed, 4 insertions, 2 deletions

diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 509332800..ce8722910 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -25,7 +25,6 @@ DIRS += [
     'crashmonitor',
     'diskspacewatcher',
     'downloads',
-    'extensions',
     'exthelper',
     'filewatcher',
     'finalizationwitness',
@@ -68,6 +67,9 @@ DIRS += [
     'xulstore'
 ]
 
+if CONFIG['MOZ_WEBEXTENSIONS']:
+    DIRS += ['webextensions']
+
 if CONFIG['ENABLE_INTL_API']:
     DIRS += ['mozintl']
 
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/components/extensions/.eslintrc.js b/toolkit/components/webextensions/.eslintrc.js
index 70196fc6a..70196fc6a 100644
--- a/toolkit/components/extensions/.eslintrc.js
+++ b/toolkit/components/webextensions/.eslintrc.js
diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/webextensions/Extension.jsm
index 3468f2594..3468f2594 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/webextensions/Extension.jsm
diff --git a/toolkit/components/extensions/ExtensionAPI.jsm b/toolkit/components/webextensions/ExtensionAPI.jsm
index 54dab8e3b..54dab8e3b 100644
--- a/toolkit/components/extensions/ExtensionAPI.jsm
+++ b/toolkit/components/webextensions/ExtensionAPI.jsm
diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/webextensions/ExtensionChild.jsm
index c953dd685..c953dd685 100644
--- a/toolkit/components/extensions/ExtensionChild.jsm
+++ b/toolkit/components/webextensions/ExtensionChild.jsm
diff --git a/toolkit/components/extensions/ExtensionCommon.jsm b/toolkit/components/webextensions/ExtensionCommon.jsm
index a339fb27e..a339fb27e 100644
--- a/toolkit/components/extensions/ExtensionCommon.jsm
+++ b/toolkit/components/webextensions/ExtensionCommon.jsm
diff --git a/toolkit/components/extensions/ExtensionContent.jsm b/toolkit/components/webextensions/ExtensionContent.jsm
index 9b9a02091..9b9a02091 100644
--- a/toolkit/components/extensions/ExtensionContent.jsm
+++ b/toolkit/components/webextensions/ExtensionContent.jsm
diff --git a/toolkit/components/extensions/ExtensionManagement.jsm b/toolkit/components/webextensions/ExtensionManagement.jsm
index 324c5b71b..324c5b71b 100644
--- a/toolkit/components/extensions/ExtensionManagement.jsm
+++ b/toolkit/components/webextensions/ExtensionManagement.jsm
diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/webextensions/ExtensionParent.jsm
index b88500d1e..b88500d1e 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/webextensions/ExtensionParent.jsm
diff --git a/toolkit/components/extensions/ExtensionStorage.jsm b/toolkit/components/webextensions/ExtensionStorage.jsm
index 0b0ffb000..0b0ffb000 100644
--- a/toolkit/components/extensions/ExtensionStorage.jsm
+++ b/toolkit/components/webextensions/ExtensionStorage.jsm
diff --git a/toolkit/components/extensions/ExtensionTestCommon.jsm b/toolkit/components/webextensions/ExtensionTestCommon.jsm
index 02453ddfd..02453ddfd 100644
--- a/toolkit/components/extensions/ExtensionTestCommon.jsm
+++ b/toolkit/components/webextensions/ExtensionTestCommon.jsm
diff --git a/toolkit/components/extensions/ExtensionUtils.jsm b/toolkit/components/webextensions/ExtensionUtils.jsm
index e7f768c07..e7f768c07 100644
--- a/toolkit/components/extensions/ExtensionUtils.jsm
+++ b/toolkit/components/webextensions/ExtensionUtils.jsm
diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm b/toolkit/components/webextensions/ExtensionXPCShellUtils.jsm
index 339709a19..339709a19 100644
--- a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
+++ b/toolkit/components/webextensions/ExtensionXPCShellUtils.jsm
diff --git a/toolkit/components/extensions/LegacyExtensionsUtils.jsm b/toolkit/components/webextensions/LegacyExtensionsUtils.jsm
index 7632548e3..7632548e3 100644
--- a/toolkit/components/extensions/LegacyExtensionsUtils.jsm
+++ b/toolkit/components/webextensions/LegacyExtensionsUtils.jsm
diff --git a/toolkit/components/extensions/MessageChannel.jsm b/toolkit/components/webextensions/MessageChannel.jsm
index c5b326405..c5b326405 100644
--- a/toolkit/components/extensions/MessageChannel.jsm
+++ b/toolkit/components/webextensions/MessageChannel.jsm
diff --git a/toolkit/components/extensions/NativeMessaging.jsm b/toolkit/components/webextensions/NativeMessaging.jsm
index 3d8658a3f..3d8658a3f 100644
--- a/toolkit/components/extensions/NativeMessaging.jsm
+++ b/toolkit/components/webextensions/NativeMessaging.jsm
diff --git a/toolkit/components/extensions/Schemas.jsm b/toolkit/components/webextensions/Schemas.jsm
index 159211c79..159211c79 100644
--- a/toolkit/components/extensions/Schemas.jsm
+++ b/toolkit/components/webextensions/Schemas.jsm
diff --git a/toolkit/components/extensions/ext-alarms.js b/toolkit/components/webextensions/ext-alarms.js
index 2171e7dba..2171e7dba 100644
--- a/toolkit/components/extensions/ext-alarms.js
+++ b/toolkit/components/webextensions/ext-alarms.js
diff --git a/toolkit/components/extensions/ext-backgroundPage.js b/toolkit/components/webextensions/ext-backgroundPage.js
index fce6100ca..fce6100ca 100644
--- a/toolkit/components/extensions/ext-backgroundPage.js
+++ b/toolkit/components/webextensions/ext-backgroundPage.js
diff --git a/toolkit/components/extensions/ext-browser-content.js b/toolkit/components/webextensions/ext-browser-content.js
index e14ca50d6..e14ca50d6 100644
--- a/toolkit/components/extensions/ext-browser-content.js
+++ b/toolkit/components/webextensions/ext-browser-content.js
diff --git a/toolkit/components/extensions/ext-c-backgroundPage.js b/toolkit/components/webextensions/ext-c-backgroundPage.js
index b5074dd9a..b5074dd9a 100644
--- a/toolkit/components/extensions/ext-c-backgroundPage.js
+++ b/toolkit/components/webextensions/ext-c-backgroundPage.js
diff --git a/toolkit/components/extensions/ext-c-extension.js b/toolkit/components/webextensions/ext-c-extension.js
index 669309bea..669309bea 100644
--- a/toolkit/components/extensions/ext-c-extension.js
+++ b/toolkit/components/webextensions/ext-c-extension.js
diff --git a/toolkit/components/extensions/ext-c-runtime.js b/toolkit/components/webextensions/ext-c-runtime.js
index 8adca60ca..8adca60ca 100644
--- a/toolkit/components/extensions/ext-c-runtime.js
+++ b/toolkit/components/webextensions/ext-c-runtime.js
diff --git a/toolkit/components/extensions/ext-c-storage.js b/toolkit/components/webextensions/ext-c-storage.js
index e8d53058f..e8d53058f 100644
--- a/toolkit/components/extensions/ext-c-storage.js
+++ b/toolkit/components/webextensions/ext-c-storage.js
diff --git a/toolkit/components/extensions/ext-c-test.js b/toolkit/components/webextensions/ext-c-test.js
index b0c92f79f..b0c92f79f 100644
--- a/toolkit/components/extensions/ext-c-test.js
+++ b/toolkit/components/webextensions/ext-c-test.js
diff --git a/toolkit/components/extensions/ext-cookies.js b/toolkit/components/webextensions/ext-cookies.js
index d0a703421..d0a703421 100644
--- a/toolkit/components/extensions/ext-cookies.js
+++ b/toolkit/components/webextensions/ext-cookies.js
diff --git a/toolkit/components/extensions/ext-downloads.js b/toolkit/components/webextensions/ext-downloads.js
index 132814ae4..132814ae4 100644
--- a/toolkit/components/extensions/ext-downloads.js
+++ b/toolkit/components/webextensions/ext-downloads.js
diff --git a/toolkit/components/extensions/ext-extension.js b/toolkit/components/webextensions/ext-extension.js
index c4bdc8b63..c4bdc8b63 100644
--- a/toolkit/components/extensions/ext-extension.js
+++ b/toolkit/components/webextensions/ext-extension.js
diff --git a/toolkit/components/extensions/ext-i18n.js b/toolkit/components/webextensions/ext-i18n.js
index bb4bde4bd..bb4bde4bd 100644
--- a/toolkit/components/extensions/ext-i18n.js
+++ b/toolkit/components/webextensions/ext-i18n.js
diff --git a/toolkit/components/extensions/ext-idle.js b/toolkit/components/webextensions/ext-idle.js
index c5be4b600..c5be4b600 100644
--- a/toolkit/components/extensions/ext-idle.js
+++ b/toolkit/components/webextensions/ext-idle.js
diff --git a/toolkit/components/extensions/ext-management.js b/toolkit/components/webextensions/ext-management.js
index 59a7959d7..59a7959d7 100644
--- a/toolkit/components/extensions/ext-management.js
+++ b/toolkit/components/webextensions/ext-management.js
diff --git a/toolkit/components/extensions/ext-notifications.js b/toolkit/components/webextensions/ext-notifications.js
index 1df96a2ac..1df96a2ac 100644
--- a/toolkit/components/extensions/ext-notifications.js
+++ b/toolkit/components/webextensions/ext-notifications.js
diff --git a/toolkit/components/extensions/ext-runtime.js b/toolkit/components/webextensions/ext-runtime.js
index aed3ffd4b..aed3ffd4b 100644
--- a/toolkit/components/extensions/ext-runtime.js
+++ b/toolkit/components/webextensions/ext-runtime.js
diff --git a/toolkit/components/extensions/ext-storage.js b/toolkit/components/webextensions/ext-storage.js
index b1e22c46c..b1e22c46c 100644
--- a/toolkit/components/extensions/ext-storage.js
+++ b/toolkit/components/webextensions/ext-storage.js
diff --git a/toolkit/components/extensions/ext-topSites.js b/toolkit/components/webextensions/ext-topSites.js
index a66ac85d9..a66ac85d9 100644
--- a/toolkit/components/extensions/ext-topSites.js
+++ b/toolkit/components/webextensions/ext-topSites.js
diff --git a/toolkit/components/extensions/ext-webNavigation.js b/toolkit/components/webextensions/ext-webNavigation.js
index 904f3a4a7..904f3a4a7 100644
--- a/toolkit/components/extensions/ext-webNavigation.js
+++ b/toolkit/components/webextensions/ext-webNavigation.js
diff --git a/toolkit/components/extensions/ext-webRequest.js b/toolkit/components/webextensions/ext-webRequest.js
index f92330131..f92330131 100644
--- a/toolkit/components/extensions/ext-webRequest.js
+++ b/toolkit/components/webextensions/ext-webRequest.js
diff --git a/toolkit/components/extensions/extensions-toolkit.manifest b/toolkit/components/webextensions/extensions-toolkit.manifest
index 4ec65a984..4ec65a984 100644
--- a/toolkit/components/extensions/extensions-toolkit.manifest
+++ b/toolkit/components/webextensions/extensions-toolkit.manifest
diff --git a/toolkit/components/extensions/jar.mn b/toolkit/components/webextensions/jar.mn
index 6d343e1b7..6d343e1b7 100644
--- a/toolkit/components/extensions/jar.mn
+++ b/toolkit/components/webextensions/jar.mn
diff --git a/toolkit/components/extensions/moz.build b/toolkit/components/webextensions/moz.build
index f32f526f9..f32f526f9 100644
--- a/toolkit/components/extensions/moz.build
+++ b/toolkit/components/webextensions/moz.build
diff --git a/toolkit/components/extensions/schemas/LICENSE b/toolkit/components/webextensions/schemas/LICENSE
index 9314092fd..9314092fd 100644
--- a/toolkit/components/extensions/schemas/LICENSE
+++ b/toolkit/components/webextensions/schemas/LICENSE
diff --git a/toolkit/components/extensions/schemas/alarms.json b/toolkit/components/webextensions/schemas/alarms.json
index 2a72a2842..2a72a2842 100644
--- a/toolkit/components/extensions/schemas/alarms.json
+++ b/toolkit/components/webextensions/schemas/alarms.json
diff --git a/toolkit/components/extensions/schemas/cookies.json b/toolkit/components/webextensions/schemas/cookies.json
index a7de6eb42..a7de6eb42 100644
--- a/toolkit/components/extensions/schemas/cookies.json
+++ b/toolkit/components/webextensions/schemas/cookies.json
diff --git a/toolkit/components/extensions/schemas/downloads.json b/toolkit/components/webextensions/schemas/downloads.json
index dcd43e4e1..dcd43e4e1 100644
--- a/toolkit/components/extensions/schemas/downloads.json
+++ b/toolkit/components/webextensions/schemas/downloads.json
diff --git a/toolkit/components/extensions/schemas/events.json b/toolkit/components/webextensions/schemas/events.json
index ea3cbb5d2..ea3cbb5d2 100644
--- a/toolkit/components/extensions/schemas/events.json
+++ b/toolkit/components/webextensions/schemas/events.json
diff --git a/toolkit/components/extensions/schemas/experiments.json b/toolkit/components/webextensions/schemas/experiments.json
index c687173a9..c687173a9 100644
--- a/toolkit/components/extensions/schemas/experiments.json
+++ b/toolkit/components/webextensions/schemas/experiments.json
diff --git a/toolkit/components/extensions/schemas/extension.json b/toolkit/components/webextensions/schemas/extension.json
index 5a1b6c935..5a1b6c935 100644
--- a/toolkit/components/extensions/schemas/extension.json
+++ b/toolkit/components/webextensions/schemas/extension.json
diff --git a/toolkit/components/extensions/schemas/extension_types.json b/toolkit/components/webextensions/schemas/extension_types.json
index 1a88e4e60..1a88e4e60 100644
--- a/toolkit/components/extensions/schemas/extension_types.json
+++ b/toolkit/components/webextensions/schemas/extension_types.json
diff --git a/toolkit/components/extensions/schemas/i18n.json b/toolkit/components/webextensions/schemas/i18n.json
index 12dc45dfc..12dc45dfc 100644
--- a/toolkit/components/extensions/schemas/i18n.json
+++ b/toolkit/components/webextensions/schemas/i18n.json
diff --git a/toolkit/components/extensions/schemas/idle.json b/toolkit/components/webextensions/schemas/idle.json
index e0b3b951e..e0b3b951e 100644
--- a/toolkit/components/extensions/schemas/idle.json
+++ b/toolkit/components/webextensions/schemas/idle.json
diff --git a/toolkit/components/extensions/schemas/jar.mn b/toolkit/components/webextensions/schemas/jar.mn
index 0bdf35b0d..0bdf35b0d 100644
--- a/toolkit/components/extensions/schemas/jar.mn
+++ b/toolkit/components/webextensions/schemas/jar.mn
diff --git a/toolkit/components/extensions/schemas/management.json b/toolkit/components/webextensions/schemas/management.json
index 413ff1d0d..413ff1d0d 100644
--- a/toolkit/components/extensions/schemas/management.json
+++ b/toolkit/components/webextensions/schemas/management.json
diff --git a/toolkit/components/extensions/schemas/manifest.json b/toolkit/components/webextensions/schemas/manifest.json
index 09e6b56fb..09e6b56fb 100644
--- a/toolkit/components/extensions/schemas/manifest.json
+++ b/toolkit/components/webextensions/schemas/manifest.json
diff --git a/toolkit/components/extensions/schemas/moz.build b/toolkit/components/webextensions/schemas/moz.build
index aac3a838c..aac3a838c 100644
--- a/toolkit/components/extensions/schemas/moz.build
+++ b/toolkit/components/webextensions/schemas/moz.build
diff --git a/toolkit/components/extensions/schemas/native_host_manifest.json b/toolkit/components/webextensions/schemas/native_host_manifest.json
index 4ad2ea7f1..4ad2ea7f1 100644
--- a/toolkit/components/extensions/schemas/native_host_manifest.json
+++ b/toolkit/components/webextensions/schemas/native_host_manifest.json
diff --git a/toolkit/components/extensions/schemas/notifications.json b/toolkit/components/webextensions/schemas/notifications.json
index 12878e8c8..12878e8c8 100644
--- a/toolkit/components/extensions/schemas/notifications.json
+++ b/toolkit/components/webextensions/schemas/notifications.json
diff --git a/toolkit/components/extensions/schemas/runtime.json b/toolkit/components/webextensions/schemas/runtime.json
index b3f12a768..b3f12a768 100644
--- a/toolkit/components/extensions/schemas/runtime.json
+++ b/toolkit/components/webextensions/schemas/runtime.json
diff --git a/toolkit/components/extensions/schemas/storage.json b/toolkit/components/webextensions/schemas/storage.json
index a54a20942..a54a20942 100644
--- a/toolkit/components/extensions/schemas/storage.json
+++ b/toolkit/components/webextensions/schemas/storage.json
diff --git a/toolkit/components/extensions/schemas/test.json b/toolkit/components/webextensions/schemas/test.json
index 25a62a96b..25a62a96b 100644
--- a/toolkit/components/extensions/schemas/test.json
+++ b/toolkit/components/webextensions/schemas/test.json
diff --git a/toolkit/components/extensions/schemas/top_sites.json b/toolkit/components/webextensions/schemas/top_sites.json
index fbfbc4b62..fbfbc4b62 100644
--- a/toolkit/components/extensions/schemas/top_sites.json
+++ b/toolkit/components/webextensions/schemas/top_sites.json
diff --git a/toolkit/components/extensions/schemas/web_navigation.json b/toolkit/components/webextensions/schemas/web_navigation.json
index 1e13b181a..1e13b181a 100644
--- a/toolkit/components/extensions/schemas/web_navigation.json
+++ b/toolkit/components/webextensions/schemas/web_navigation.json
diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/webextensions/schemas/web_request.json
index 4035aea6e..4035aea6e 100644
--- a/toolkit/components/extensions/schemas/web_request.json
+++ b/toolkit/components/webextensions/schemas/web_request.json
diff --git a/toolkit/components/extensions/test/mochitest/.eslintrc.js b/toolkit/components/webextensions/test/mochitest/.eslintrc.js
index 53938410b..53938410b 100644
--- a/toolkit/components/extensions/test/mochitest/.eslintrc.js
+++ b/toolkit/components/webextensions/test/mochitest/.eslintrc.js
diff --git a/toolkit/components/extensions/test/mochitest/chrome.ini b/toolkit/components/webextensions/test/mochitest/chrome.ini
index 26585cad7..26585cad7 100644
--- a/toolkit/components/extensions/test/mochitest/chrome.ini
+++ b/toolkit/components/webextensions/test/mochitest/chrome.ini
diff --git a/toolkit/components/extensions/test/mochitest/chrome_head.js b/toolkit/components/webextensions/test/mochitest/chrome_head.js
index da2f53a02..da2f53a02 100644
--- a/toolkit/components/extensions/test/mochitest/chrome_head.js
+++ b/toolkit/components/webextensions/test/mochitest/chrome_head.js
diff --git a/toolkit/components/extensions/test/mochitest/file_WebNavigation_page1.html b/toolkit/components/webextensions/test/mochitest/file_WebNavigation_page1.html
index 663ebc611..663ebc611 100644
--- a/toolkit/components/extensions/test/mochitest/file_WebNavigation_page1.html
+++ b/toolkit/components/webextensions/test/mochitest/file_WebNavigation_page1.html
diff --git a/toolkit/components/extensions/test/mochitest/file_WebNavigation_page2.html b/toolkit/components/webextensions/test/mochitest/file_WebNavigation_page2.html
index cc1acc83d..cc1acc83d 100644
--- a/toolkit/components/extensions/test/mochitest/file_WebNavigation_page2.html
+++ b/toolkit/components/webextensions/test/mochitest/file_WebNavigation_page2.html
diff --git a/toolkit/components/extensions/test/mochitest/file_WebNavigation_page3.html b/toolkit/components/webextensions/test/mochitest/file_WebNavigation_page3.html
index a0a26a2e9..a0a26a2e9 100644
--- a/toolkit/components/extensions/test/mochitest/file_WebNavigation_page3.html
+++ b/toolkit/components/webextensions/test/mochitest/file_WebNavigation_page3.html
diff --git a/toolkit/components/extensions/test/mochitest/file_WebRequest_page3.html b/toolkit/components/webextensions/test/mochitest/file_WebRequest_page3.html
index 5807dd439..5807dd439 100644
--- a/toolkit/components/extensions/test/mochitest/file_WebRequest_page3.html
+++ b/toolkit/components/webextensions/test/mochitest/file_WebRequest_page3.html
diff --git a/toolkit/components/extensions/test/mochitest/file_csp.html b/toolkit/components/webextensions/test/mochitest/file_csp.html
index 206e44390..206e44390 100644
--- a/toolkit/components/extensions/test/mochitest/file_csp.html
+++ b/toolkit/components/webextensions/test/mochitest/file_csp.html
diff --git a/toolkit/components/extensions/test/mochitest/file_csp.html^headers^ b/toolkit/components/webextensions/test/mochitest/file_csp.html^headers^
index 4c6fa3c26..4c6fa3c26 100644
--- a/toolkit/components/extensions/test/mochitest/file_csp.html^headers^
+++ b/toolkit/components/webextensions/test/mochitest/file_csp.html^headers^
diff --git a/toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js b/toolkit/components/webextensions/test/mochitest/file_ext_test_api_injection.js
index 06dfae65e..06dfae65e 100644
--- a/toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js
+++ b/toolkit/components/webextensions/test/mochitest/file_ext_test_api_injection.js
diff --git a/toolkit/components/extensions/test/mochitest/file_image_bad.png b/toolkit/components/webextensions/test/mochitest/file_image_bad.png
index 4c3be5084..4c3be5084 100644
--- a/toolkit/components/extensions/test/mochitest/file_image_bad.png
+++ b/toolkit/components/webextensions/test/mochitest/file_image_bad.png
diff --git a/toolkit/components/extensions/test/mochitest/file_image_good.png b/toolkit/components/webextensions/test/mochitest/file_image_good.png
index 769c63634..769c63634 100644
--- a/toolkit/components/extensions/test/mochitest/file_image_good.png
+++ b/toolkit/components/webextensions/test/mochitest/file_image_good.png
diff --git a/toolkit/components/extensions/test/mochitest/file_image_redirect.png b/toolkit/components/webextensions/test/mochitest/file_image_redirect.png
index 4c3be5084..4c3be5084 100644
--- a/toolkit/components/extensions/test/mochitest/file_image_redirect.png
+++ b/toolkit/components/webextensions/test/mochitest/file_image_redirect.png
diff --git a/toolkit/components/extensions/test/mochitest/file_mixed.html b/toolkit/components/webextensions/test/mochitest/file_mixed.html
index f3c7dda58..f3c7dda58 100644
--- a/toolkit/components/extensions/test/mochitest/file_mixed.html
+++ b/toolkit/components/webextensions/test/mochitest/file_mixed.html
diff --git a/toolkit/components/extensions/test/mochitest/file_permission_xhr.html b/toolkit/components/webextensions/test/mochitest/file_permission_xhr.html
index 22a55f90d..22a55f90d 100644
--- a/toolkit/components/extensions/test/mochitest/file_permission_xhr.html
+++ b/toolkit/components/webextensions/test/mochitest/file_permission_xhr.html
diff --git a/toolkit/components/extensions/test/mochitest/file_privilege_escalation.html b/toolkit/components/webextensions/test/mochitest/file_privilege_escalation.html
index 258f7058d..258f7058d 100644
--- a/toolkit/components/extensions/test/mochitest/file_privilege_escalation.html
+++ b/toolkit/components/webextensions/test/mochitest/file_privilege_escalation.html
diff --git a/toolkit/components/extensions/test/mochitest/file_sample.html b/toolkit/components/webextensions/test/mochitest/file_sample.html
index a20e49a1f..a20e49a1f 100644
--- a/toolkit/components/extensions/test/mochitest/file_sample.html
+++ b/toolkit/components/webextensions/test/mochitest/file_sample.html
diff --git a/toolkit/components/extensions/test/mochitest/file_script_bad.js b/toolkit/components/webextensions/test/mochitest/file_script_bad.js
index c425122c7..c425122c7 100644
--- a/toolkit/components/extensions/test/mochitest/file_script_bad.js
+++ b/toolkit/components/webextensions/test/mochitest/file_script_bad.js
diff --git a/toolkit/components/extensions/test/mochitest/file_script_good.js b/toolkit/components/webextensions/test/mochitest/file_script_good.js
index 1848edf68..1848edf68 100644
--- a/toolkit/components/extensions/test/mochitest/file_script_good.js
+++ b/toolkit/components/webextensions/test/mochitest/file_script_good.js
diff --git a/toolkit/components/extensions/test/mochitest/file_script_redirect.js b/toolkit/components/webextensions/test/mochitest/file_script_redirect.js
index c89a196c2..c89a196c2 100644
--- a/toolkit/components/extensions/test/mochitest/file_script_redirect.js
+++ b/toolkit/components/webextensions/test/mochitest/file_script_redirect.js
diff --git a/toolkit/components/extensions/test/mochitest/file_script_xhr.js b/toolkit/components/webextensions/test/mochitest/file_script_xhr.js
index 07f80eb2e..07f80eb2e 100644
--- a/toolkit/components/extensions/test/mochitest/file_script_xhr.js
+++ b/toolkit/components/webextensions/test/mochitest/file_script_xhr.js
diff --git a/toolkit/components/extensions/test/mochitest/file_style_bad.css b/toolkit/components/webextensions/test/mochitest/file_style_bad.css
index 8dbc8dc7a..8dbc8dc7a 100644
--- a/toolkit/components/extensions/test/mochitest/file_style_bad.css
+++ b/toolkit/components/webextensions/test/mochitest/file_style_bad.css
diff --git a/toolkit/components/extensions/test/mochitest/file_style_good.css b/toolkit/components/webextensions/test/mochitest/file_style_good.css
index 46f9774b5..46f9774b5 100644
--- a/toolkit/components/extensions/test/mochitest/file_style_good.css
+++ b/toolkit/components/webextensions/test/mochitest/file_style_good.css
diff --git a/toolkit/components/extensions/test/mochitest/file_style_redirect.css b/toolkit/components/webextensions/test/mochitest/file_style_redirect.css
index 8dbc8dc7a..8dbc8dc7a 100644
--- a/toolkit/components/extensions/test/mochitest/file_style_redirect.css
+++ b/toolkit/components/webextensions/test/mochitest/file_style_redirect.css
diff --git a/toolkit/components/extensions/test/mochitest/file_teardown_test.js b/toolkit/components/webextensions/test/mochitest/file_teardown_test.js
index 7246012ad..7246012ad 100644
--- a/toolkit/components/extensions/test/mochitest/file_teardown_test.js
+++ b/toolkit/components/webextensions/test/mochitest/file_teardown_test.js
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_clientRedirect.html
index cba3043f7..cba3043f7 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_clientRedirect.html
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html
index c5b436979..c5b436979 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html^headers^ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html^headers^
index 574a392a1..574a392a1 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html^headers^
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html^headers^
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_frameClientRedirect.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_frameClientRedirect.html
index d360bcbb1..d360bcbb1 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_frameClientRedirect.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_frameClientRedirect.html
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_frameRedirect.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_frameRedirect.html
index 06dbd4374..06dbd4374 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_frameRedirect.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_frameRedirect.html
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_manualSubframe.html
index 307990714..307990714 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_manualSubframe.html
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe_page1.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_manualSubframe_page1.html
index 55bb7aa6a..55bb7aa6a 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe_page1.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_manualSubframe_page1.html
diff --git a/toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe_page2.html b/toolkit/components/webextensions/test/mochitest/file_webNavigation_manualSubframe_page2.html
index 8f589f8bb..8f589f8bb 100644
--- a/toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe_page2.html
+++ b/toolkit/components/webextensions/test/mochitest/file_webNavigation_manualSubframe_page2.html
diff --git a/toolkit/components/extensions/test/mochitest/file_with_about_blank.html b/toolkit/components/webextensions/test/mochitest/file_with_about_blank.html
index af51c2e52..af51c2e52 100644
--- a/toolkit/components/extensions/test/mochitest/file_with_about_blank.html
+++ b/toolkit/components/webextensions/test/mochitest/file_with_about_blank.html
diff --git a/toolkit/components/extensions/test/mochitest/head.js b/toolkit/components/webextensions/test/mochitest/head.js
index 1b1a29472..1b1a29472 100644
--- a/toolkit/components/extensions/test/mochitest/head.js
+++ b/toolkit/components/webextensions/test/mochitest/head.js
diff --git a/toolkit/components/extensions/test/mochitest/head_cookies.js b/toolkit/components/webextensions/test/mochitest/head_cookies.js
index 9f6966551..9f6966551 100644
--- a/toolkit/components/extensions/test/mochitest/head_cookies.js
+++ b/toolkit/components/webextensions/test/mochitest/head_cookies.js
diff --git a/toolkit/components/extensions/test/mochitest/head_webrequest.js b/toolkit/components/webextensions/test/mochitest/head_webrequest.js
index 96924e505..96924e505 100644
--- a/toolkit/components/extensions/test/mochitest/head_webrequest.js
+++ b/toolkit/components/webextensions/test/mochitest/head_webrequest.js
diff --git a/toolkit/components/extensions/test/mochitest/mochitest.ini b/toolkit/components/webextensions/test/mochitest/mochitest.ini
index 45586237e..45586237e 100644
--- a/toolkit/components/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/components/webextensions/test/mochitest/mochitest.ini
diff --git a/toolkit/components/extensions/test/mochitest/redirection.sjs b/toolkit/components/webextensions/test/mochitest/redirection.sjs
index 370ecd213..370ecd213 100644
--- a/toolkit/components/extensions/test/mochitest/redirection.sjs
+++ b/toolkit/components/webextensions/test/mochitest/redirection.sjs
diff --git a/toolkit/components/extensions/test/mochitest/return_headers.sjs b/toolkit/components/webextensions/test/mochitest/return_headers.sjs
index 54e2e5fb4..54e2e5fb4 100644
--- a/toolkit/components/extensions/test/mochitest/return_headers.sjs
+++ b/toolkit/components/webextensions/test/mochitest/return_headers.sjs
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_debug_global.html
index 0edf5ea86..0edf5ea86 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_debug_global.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_page.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_page.html
index 3c4774652..3c4774652 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_background_page.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_background_page.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_contentscript_unrecognizedprop_warning.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_contentscript_unrecognizedprop_warning.html
index e08121a8f..e08121a8f 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_contentscript_unrecognizedprop_warning.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_contentscript_unrecognizedprop_warning.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_downloads_saveAs.html
index c1aaae035..c1aaae035 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_downloads_saveAs.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_eventpage_warning.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_eventpage_warning.html
index ecea8237e..ecea8237e 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_eventpage_warning.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_eventpage_warning.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_hybrid_addons.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_hybrid_addons.html
index a74c551f0..a74c551f0 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_hybrid_addons.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_hybrid_addons.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_idle.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_idle.html
index 3c3063e67..3c3063e67 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_idle.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_idle.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html
index e3098e6b1..e3098e6b1 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_storage_cleanup.html
index 010769500..010769500 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_storage_cleanup.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_trustworthy_origin.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_trustworthy_origin.html
index 573c08806..573c08806 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_trustworthy_origin.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_trustworthy_origin.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html
index 768eb31fd..768eb31fd 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_background_events.html b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_webrequest_background_events.html
index a13c4d475..a13c4d475 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_background_events.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_ext_webrequest_background_events.html
diff --git a/toolkit/components/extensions/test/mochitest/test_chrome_native_messaging_paths.html b/toolkit/components/webextensions/test/mochitest/test_chrome_native_messaging_paths.html
index 29a148063..29a148063 100644
--- a/toolkit/components/extensions/test/mochitest/test_chrome_native_messaging_paths.html
+++ b/toolkit/components/webextensions/test/mochitest/test_chrome_native_messaging_paths.html
diff --git a/toolkit/components/extensions/test/mochitest/test_clipboard.html b/toolkit/components/webextensions/test/mochitest/test_clipboard.html
index 900ee5f10..900ee5f10 100644
--- a/toolkit/components/extensions/test/mochitest/test_clipboard.html
+++ b/toolkit/components/webextensions/test/mochitest/test_clipboard.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_all_apis.js b/toolkit/components/webextensions/test/mochitest/test_ext_all_apis.js
index 0f617c37e..0f617c37e 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_all_apis.js
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_all_apis.js
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_background_api_injection.html b/toolkit/components/webextensions/test/mochitest/test_ext_background_api_injection.html
index f43a59f81..f43a59f81 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_background_api_injection.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_background_api_injection.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_background_canvas.html b/toolkit/components/webextensions/test/mochitest/test_ext_background_canvas.html
index bff7190cb..bff7190cb 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_background_canvas.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_background_canvas.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_background_generated_url.html b/toolkit/components/webextensions/test/mochitest/test_ext_background_generated_url.html
index f4fcf3d34..f4fcf3d34 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_background_generated_url.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_background_generated_url.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_background_teardown.html b/toolkit/components/webextensions/test/mochitest/test_ext_background_teardown.html
index bb6b2e970..bb6b2e970 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_background_teardown.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_background_teardown.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html b/toolkit/components/webextensions/test/mochitest/test_ext_content_security_policy.html
index a36f29563..a36f29563 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_content_security_policy.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript.html
index 39f1bfabd..39f1bfabd 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_about_blank.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_about_blank.html
index 3766678e7..3766678e7 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_about_blank.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_about_blank.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_api_injection.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_api_injection.html
index abf3d349f..abf3d349f 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_api_injection.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_api_injection.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_async_loading.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_async_loading.html
index d78f7ce02..d78f7ce02 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_async_loading.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_async_loading.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_context.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_context.html
index 97b1645dd..97b1645dd 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_context.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_context.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_create_iframe.html
index 8aac3e213..8aac3e213 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_create_iframe.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_css.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_css.html
index 5630a1d68..5630a1d68 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_css.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_css.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_devtools_metadata.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_devtools_metadata.html
index 137a3cda4..137a3cda4 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_devtools_metadata.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_devtools_metadata.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_exporthelpers.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_exporthelpers.html
index f3414901d..f3414901d 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_exporthelpers.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_exporthelpers.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_incognito.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_incognito.html
index a2f38dce6..a2f38dce6 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_incognito.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_incognito.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_permission.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_permission.html
index eaf815092..eaf815092 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_permission.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_permission.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_teardown.html b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_teardown.html
index 33a8c4ccc..33a8c4ccc 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_teardown.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_contentscript_teardown.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies.html b/toolkit/components/webextensions/test/mochitest/test_ext_cookies.html
index d414a4e46..d414a4e46 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_cookies.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_containers.html
index bc4994eec..bc4994eec 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_containers.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_expiry.html
index 3927d9e94..3927d9e94 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_expiry.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_permissions_bad.html
index 15a62855a..15a62855a 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_permissions_bad.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_permissions_good.html
index 31e83188c..31e83188c 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_cookies_permissions_good.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_exclude_include_globs.html b/toolkit/components/webextensions/test/mochitest/test_ext_exclude_include_globs.html
index 640522b40..640522b40 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_exclude_include_globs.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_exclude_include_globs.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_generate.html b/toolkit/components/webextensions/test/mochitest/test_ext_generate.html
index cfafcbad9..cfafcbad9 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_generate.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_generate.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_geturl.html b/toolkit/components/webextensions/test/mochitest/test_ext_geturl.html
index 6e39c2f5d..6e39c2f5d 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_geturl.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_geturl.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_i18n.html b/toolkit/components/webextensions/test/mochitest/test_ext_i18n.html
index 1f7330bbb..1f7330bbb 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_i18n.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_i18n.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html b/toolkit/components/webextensions/test/mochitest/test_ext_i18n_css.html
index 7c6a8eeaa..7c6a8eeaa 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_i18n_css.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_inIncognitoContext_window.html b/toolkit/components/webextensions/test/mochitest/test_ext_inIncognitoContext_window.html
index 675cbb298..675cbb298 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_inIncognitoContext_window.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_inIncognitoContext_window.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_jsversion.html b/toolkit/components/webextensions/test/mochitest/test_ext_jsversion.html
index da0c355e0..da0c355e0 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_jsversion.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_jsversion.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_listener_proxies.html b/toolkit/components/webextensions/test/mochitest/test_ext_listener_proxies.html
index ca8db873e..ca8db873e 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_listener_proxies.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_listener_proxies.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_notifications.html b/toolkit/components/webextensions/test/mochitest/test_ext_notifications.html
index d1b798cf9..d1b798cf9 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_notifications.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_notifications.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html b/toolkit/components/webextensions/test/mochitest/test_ext_permission_xhr.html
index 07967d5d0..07967d5d0 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_permission_xhr.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_runtime_connect.html b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_connect.html
index 60351eaee..60351eaee 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_runtime_connect.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_connect.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_runtime_connect2.html b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_connect2.html
index dce12b21b..dce12b21b 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_runtime_connect2.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_connect2.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_runtime_connect_twoway.html b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_connect_twoway.html
index e84134eff..e84134eff 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_runtime_connect_twoway.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_connect_twoway.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_runtime_disconnect.html b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_disconnect.html
index 5764d0a3c..5764d0a3c 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_runtime_disconnect.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_disconnect.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_runtime_id.html b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_id.html
index 4cdefda41..4cdefda41 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_runtime_id.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_runtime_id.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_sandbox_var.html b/toolkit/components/webextensions/test/mochitest/test_ext_sandbox_var.html
index 426a71ac6..426a71ac6 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_sandbox_var.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_sandbox_var.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_schema.html b/toolkit/components/webextensions/test/mochitest/test_ext_schema.html
index 8a0e11c56..8a0e11c56 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_schema.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_schema.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_doublereply.html b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_doublereply.html
index a3ef37cad..a3ef37cad 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_doublereply.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_doublereply.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_no_receiver.html b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_no_receiver.html
index 96af6558e..96af6558e 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_no_receiver.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_no_receiver.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_reply.html b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_reply.html
index a4ac708b2..a4ac708b2 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_reply.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_reply.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_reply2.html b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_reply2.html
index 1ebc1b40f..1ebc1b40f 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_sendmessage_reply2.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_sendmessage_reply2.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_storage_content.html b/toolkit/components/webextensions/test/mochitest/test_ext_storage_content.html
index 09a33814a..09a33814a 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_storage_content.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_storage_content.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html b/toolkit/components/webextensions/test/mochitest/test_ext_storage_tab.html
index 32d8e6af0..32d8e6af0 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_storage_tab.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_subframes_privileges.html b/toolkit/components/webextensions/test/mochitest/test_ext_subframes_privileges.html
index 1f3a9a3c9..1f3a9a3c9 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_subframes_privileges.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_subframes_privileges.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_tab_teardown.html b/toolkit/components/webextensions/test/mochitest/test_ext_tab_teardown.html
index dc351e48a..dc351e48a 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_tab_teardown.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_tab_teardown.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_test.html b/toolkit/components/webextensions/test/mochitest/test_ext_test.html
index fef31e0e2..fef31e0e2 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_test.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_test.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_unload_frame.html b/toolkit/components/webextensions/test/mochitest/test_ext_unload_frame.html
index 5572de281..5572de281 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_unload_frame.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_unload_frame.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html b/toolkit/components/webextensions/test/mochitest/test_ext_web_accessible_resources.html
index fa3228739..fa3228739 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_web_accessible_resources.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webnavigation.html b/toolkit/components/webextensions/test/mochitest/test_ext_webnavigation.html
index 2287fd9b1..2287fd9b1 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webnavigation.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_webnavigation.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webnavigation_filters.html b/toolkit/components/webextensions/test/mochitest/test_ext_webnavigation_filters.html
index a0de5e9e5..a0de5e9e5 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webnavigation_filters.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_webnavigation_filters.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_background_events.html b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_background_events.html
index 78efeab35..78efeab35 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_background_events.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_background_events.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_basic.html
index ef77fee3b..ef77fee3b 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_basic.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_suspend.html b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_suspend.html
index c8423ec7c..c8423ec7c 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_suspend.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_suspend.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_upload.html
index 998ab9800..998ab9800 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_webrequest_upload.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_window_postMessage.html b/toolkit/components/webextensions/test/mochitest/test_ext_window_postMessage.html
index 7d49d55ba..7d49d55ba 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_window_postMessage.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_window_postMessage.html
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_xhr_capabilities.html b/toolkit/components/webextensions/test/mochitest/test_ext_xhr_capabilities.html
index 1afdadb9f..1afdadb9f 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_xhr_capabilities.html
+++ b/toolkit/components/webextensions/test/mochitest/test_ext_xhr_capabilities.html
diff --git a/toolkit/components/extensions/test/mochitest/webrequest_chromeworker.js b/toolkit/components/webextensions/test/mochitest/webrequest_chromeworker.js
index ccfb2ac1f..ccfb2ac1f 100644
--- a/toolkit/components/extensions/test/mochitest/webrequest_chromeworker.js
+++ b/toolkit/components/webextensions/test/mochitest/webrequest_chromeworker.js
diff --git a/toolkit/components/extensions/test/mochitest/webrequest_test.jsm b/toolkit/components/webextensions/test/mochitest/webrequest_test.jsm
index bfb148301..bfb148301 100644
--- a/toolkit/components/extensions/test/mochitest/webrequest_test.jsm
+++ b/toolkit/components/webextensions/test/mochitest/webrequest_test.jsm
diff --git a/toolkit/components/extensions/test/mochitest/webrequest_worker.js b/toolkit/components/webextensions/test/mochitest/webrequest_worker.js
index dcffd0857..dcffd0857 100644
--- a/toolkit/components/extensions/test/mochitest/webrequest_worker.js
+++ b/toolkit/components/webextensions/test/mochitest/webrequest_worker.js
diff --git a/toolkit/components/extensions/test/xpcshell/.eslintrc.js b/toolkit/components/webextensions/test/xpcshell/.eslintrc.js
index 3758537ef..3758537ef 100644
--- a/toolkit/components/extensions/test/xpcshell/.eslintrc.js
+++ b/toolkit/components/webextensions/test/xpcshell/.eslintrc.js
diff --git a/toolkit/components/extensions/test/xpcshell/data/file_download.html b/toolkit/components/webextensions/test/xpcshell/data/file_download.html
index d970c6325..d970c6325 100644
--- a/toolkit/components/extensions/test/xpcshell/data/file_download.html
+++ b/toolkit/components/webextensions/test/xpcshell/data/file_download.html
diff --git a/toolkit/components/extensions/test/xpcshell/data/file_download.txt b/toolkit/components/webextensions/test/xpcshell/data/file_download.txt
index 6293c7af7..6293c7af7 100644
--- a/toolkit/components/extensions/test/xpcshell/data/file_download.txt
+++ b/toolkit/components/webextensions/test/xpcshell/data/file_download.txt
diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/webextensions/test/xpcshell/head.js
index 9e22be6da..9e22be6da 100644
--- a/toolkit/components/extensions/test/xpcshell/head.js
+++ b/toolkit/components/webextensions/test/xpcshell/head.js
diff --git a/toolkit/components/extensions/test/xpcshell/head_native_messaging.js b/toolkit/components/webextensions/test/xpcshell/head_native_messaging.js
index f7c619b76..f7c619b76 100644
--- a/toolkit/components/extensions/test/xpcshell/head_native_messaging.js
+++ b/toolkit/components/webextensions/test/xpcshell/head_native_messaging.js
diff --git a/toolkit/components/extensions/test/xpcshell/head_sync.js b/toolkit/components/webextensions/test/xpcshell/head_sync.js
index 9b66b78e7..9b66b78e7 100644
--- a/toolkit/components/extensions/test/xpcshell/head_sync.js
+++ b/toolkit/components/webextensions/test/xpcshell/head_sync.js
diff --git a/toolkit/components/extensions/test/xpcshell/native_messaging.ini b/toolkit/components/webextensions/test/xpcshell/native_messaging.ini
index d0e1da163..d0e1da163 100644
--- a/toolkit/components/extensions/test/xpcshell/native_messaging.ini
+++ b/toolkit/components/webextensions/test/xpcshell/native_messaging.ini
diff --git a/toolkit/components/extensions/test/xpcshell/test_csp_custom_policies.js b/toolkit/components/webextensions/test/xpcshell/test_csp_custom_policies.js
index b6213baac..b6213baac 100644
--- a/toolkit/components/extensions/test/xpcshell/test_csp_custom_policies.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_csp_custom_policies.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_csp_validator.js b/toolkit/components/webextensions/test/xpcshell/test_csp_validator.js
index 59a7322bc..59a7322bc 100644
--- a/toolkit/components/extensions/test/xpcshell/test_csp_validator.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_csp_validator.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms.js
index 936c984c6..936c984c6 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms_does_not_fire.js
index 11407b108..11407b108 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms_does_not_fire.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms_periodic.js
index 6bcdf4e33..6bcdf4e33 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms_periodic.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_replaces.js b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms_replaces.js
index 96f61acb5..96f61acb5 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_alarms_replaces.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_alarms_replaces.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_api_permissions.js b/toolkit/components/webextensions/test/xpcshell/test_ext_api_permissions.js
index d653d0e7a..d653d0e7a 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_api_permissions.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_api_permissions.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_apimanager.js b/toolkit/components/webextensions/test/xpcshell/test_ext_apimanager.js
index 3f6672a11..3f6672a11 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_apimanager.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_apimanager.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_generated_load_events.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_generated_load_events.js
index 26282fcb9..26282fcb9 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_generated_load_events.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_generated_load_events.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_generated_reload.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_generated_reload.js
index 4bf59b798..4bf59b798 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_generated_reload.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_generated_reload.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_global_history.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_global_history.js
index 092a9f5b3..092a9f5b3 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_global_history.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_global_history.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_private_browsing.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_private_browsing.js
index 8e8b5e0b0..8e8b5e0b0 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_private_browsing.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_private_browsing.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_runtime_connect_params.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_runtime_connect_params.js
index 426833edd..426833edd 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_runtime_connect_params.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_runtime_connect_params.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_sub_windows.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_sub_windows.js
index c5f2f1332..c5f2f1332 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_sub_windows.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_sub_windows.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_background_window_properties.js b/toolkit/components/webextensions/test/xpcshell/test_ext_background_window_properties.js
index 948e2913e..948e2913e 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_background_window_properties.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_background_window_properties.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_contexts.js b/toolkit/components/webextensions/test/xpcshell/test_ext_contexts.js
index 56a14e189..56a14e189 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_contexts.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_contexts.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_downloads.js b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads.js
index 058b9b18c..058b9b18c 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_downloads.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_download.js b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads_download.js
index 37ddd4d7c..37ddd4d7c 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_download.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads_download.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads_misc.js
index d08aab666..d08aab666 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads_misc.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_search.js b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads_search.js
index 4caa82456..4caa82456 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_downloads_search.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_downloads_search.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_experiments.js b/toolkit/components/webextensions/test/xpcshell/test_ext_experiments.js
index bc6bfcd68..bc6bfcd68 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_experiments.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_experiments.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_extension.js b/toolkit/components/webextensions/test/xpcshell/test_ext_extension.js
index f18845f6a..f18845f6a 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_extension.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_extension.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_idle.js b/toolkit/components/webextensions/test/xpcshell/test_ext_idle.js
index 89bcac217..89bcac217 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_idle.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_idle.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_json_parser.js b/toolkit/components/webextensions/test/xpcshell/test_ext_json_parser.js
index 652f41315..652f41315 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_json_parser.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_json_parser.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_context.js b/toolkit/components/webextensions/test/xpcshell/test_ext_legacy_extension_context.js
index 63d5361a1..63d5361a1 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_context.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_legacy_extension_context.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_embedding.js b/toolkit/components/webextensions/test/xpcshell/test_ext_legacy_extension_embedding.js
index ea5d78524..ea5d78524 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_embedding.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_legacy_extension_embedding.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_localStorage.js b/toolkit/components/webextensions/test/xpcshell/test_ext_localStorage.js
index 0f0b41085..0f0b41085 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_localStorage.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_localStorage.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_management.js b/toolkit/components/webextensions/test/xpcshell/test_ext_management.js
index b19554a57..b19554a57 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_management.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_management.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_management_uninstall_self.js b/toolkit/components/webextensions/test/xpcshell/test_ext_management_uninstall_self.js
index 7d80a9c23..7d80a9c23 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_management_uninstall_self.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_management_uninstall_self.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_manifest_content_security_policy.js b/toolkit/components/webextensions/test/xpcshell/test_ext_manifest_content_security_policy.js
index 2b0084980..2b0084980 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_manifest_content_security_policy.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_manifest_content_security_policy.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_manifest_incognito.js b/toolkit/components/webextensions/test/xpcshell/test_ext_manifest_incognito.js
index 94649692e..94649692e 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_manifest_incognito.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_manifest_incognito.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_manifest_minimum_chrome_version.js b/toolkit/components/webextensions/test/xpcshell/test_ext_manifest_minimum_chrome_version.js
index fad5661bb..fad5661bb 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_manifest_minimum_chrome_version.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_manifest_minimum_chrome_version.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_native_messaging.js b/toolkit/components/webextensions/test/xpcshell/test_ext_native_messaging.js
index 5a6b628f5..5a6b628f5 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_native_messaging.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_native_messaging.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_perf.js b/toolkit/components/webextensions/test/xpcshell/test_ext_native_messaging_perf.js
index 693f67dde..693f67dde 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_perf.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_native_messaging_perf.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_unresponsive.js b/toolkit/components/webextensions/test/xpcshell/test_ext_native_messaging_unresponsive.js
index a75a1d49d..a75a1d49d 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_unresponsive.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_native_messaging_unresponsive.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_onmessage_removelistener.js b/toolkit/components/webextensions/test/xpcshell/test_ext_onmessage_removelistener.js
index 6f8b553fc..6f8b553fc 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_onmessage_removelistener.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_onmessage_removelistener.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js
index 2a1342cde..2a1342cde 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_getBrowserInfo.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_getBrowserInfo.js
index a280206fa..a280206fa 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_getBrowserInfo.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_getBrowserInfo.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js
index 29bad0c10..29bad0c10 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_onInstalled_and_onStartup.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_onInstalled_and_onStartup.js
index fa6461412..fa6461412 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_onInstalled_and_onStartup.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_onInstalled_and_onStartup.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage.js
index fec8e13dd..fec8e13dd 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_errors.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage_errors.js
index f1a8d5a36..f1a8d5a36 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_errors.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage_errors.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js
index f906333d2..f906333d2 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_self.js b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage_self.js
index e4f5e951f..e4f5e951f 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_self.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_runtime_sendMessage_self.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas.js
index d838be5b5..d838be5b5 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_allowed_contexts.js b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas_allowed_contexts.js
index 606459764..606459764 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_allowed_contexts.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas_allowed_contexts.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_api_injection.js b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas_api_injection.js
index 36d88d722..36d88d722 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_api_injection.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas_api_injection.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_async.js b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas_async.js
index 6397d1f96..6397d1f96 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_async.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_schemas_async.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_simple.js b/toolkit/components/webextensions/test/xpcshell/test_ext_simple.js
index 91b10354c..91b10354c 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_simple.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_simple.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_storage.js b/toolkit/components/webextensions/test/xpcshell/test_ext_storage.js
index df46dfb63..df46dfb63 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_storage.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_storage.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_topSites.js b/toolkit/components/webextensions/test/xpcshell/test_ext_topSites.js
index eb3f552ed..eb3f552ed 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_topSites.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_ext_topSites.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_getAPILevelForWindow.js b/toolkit/components/webextensions/test/xpcshell/test_getAPILevelForWindow.js
index 68741a6cc..68741a6cc 100644
--- a/toolkit/components/extensions/test/xpcshell/test_getAPILevelForWindow.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_getAPILevelForWindow.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_locale_converter.js b/toolkit/components/webextensions/test/xpcshell/test_locale_converter.js
index c8b1ee92b..c8b1ee92b 100644
--- a/toolkit/components/extensions/test/xpcshell/test_locale_converter.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_locale_converter.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_locale_data.js b/toolkit/components/webextensions/test/xpcshell/test_locale_data.js
index c3cd44e57..c3cd44e57 100644
--- a/toolkit/components/extensions/test/xpcshell/test_locale_data.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_locale_data.js
diff --git a/toolkit/components/extensions/test/xpcshell/test_native_messaging.js b/toolkit/components/webextensions/test/xpcshell/test_native_messaging.js
index 1fcb7799e..1fcb7799e 100644
--- a/toolkit/components/extensions/test/xpcshell/test_native_messaging.js
+++ b/toolkit/components/webextensions/test/xpcshell/test_native_messaging.js
diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell.ini b/toolkit/components/webextensions/test/xpcshell/xpcshell.ini
index d2c6fd5d0..d2c6fd5d0 100644
--- a/toolkit/components/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/webextensions/test/xpcshell/xpcshell.ini