diff --git a/browser/configure.in b/browser/configure.in index 7a1d72ae60..9638c1e4d2 100644 --- a/browser/configure.in +++ b/browser/configure.in @@ -16,7 +16,7 @@ dnl Optional parts of the build. dnl ======================================================== dnl = Disable WebExtensions dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(browser-statusbar, +MOZ_ARG_DISABLE_BOOL(webextensions, [ --disable-webextensions Disable WebExtensions], MOZ_WEBEXTENSIONS=, MOZ_WEBEXTENSIONS=1) diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index 509332800e..ce8722910b 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/extensions/.eslintrc.js b/toolkit/components/webextensions/.eslintrc.js similarity index 100% rename from toolkit/components/extensions/.eslintrc.js rename to toolkit/components/webextensions/.eslintrc.js diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/webextensions/Extension.jsm similarity index 100% rename from toolkit/components/extensions/Extension.jsm rename to toolkit/components/webextensions/Extension.jsm diff --git a/toolkit/components/extensions/ExtensionAPI.jsm b/toolkit/components/webextensions/ExtensionAPI.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionAPI.jsm rename to toolkit/components/webextensions/ExtensionAPI.jsm diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/webextensions/ExtensionChild.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionChild.jsm rename to toolkit/components/webextensions/ExtensionChild.jsm diff --git a/toolkit/components/extensions/ExtensionCommon.jsm b/toolkit/components/webextensions/ExtensionCommon.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionCommon.jsm rename to toolkit/components/webextensions/ExtensionCommon.jsm diff --git a/toolkit/components/extensions/ExtensionContent.jsm b/toolkit/components/webextensions/ExtensionContent.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionContent.jsm rename to toolkit/components/webextensions/ExtensionContent.jsm diff --git a/toolkit/components/extensions/ExtensionManagement.jsm b/toolkit/components/webextensions/ExtensionManagement.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionManagement.jsm rename to toolkit/components/webextensions/ExtensionManagement.jsm diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/webextensions/ExtensionParent.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionParent.jsm rename to toolkit/components/webextensions/ExtensionParent.jsm diff --git a/toolkit/components/extensions/ExtensionStorage.jsm b/toolkit/components/webextensions/ExtensionStorage.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionStorage.jsm rename to toolkit/components/webextensions/ExtensionStorage.jsm diff --git a/toolkit/components/extensions/ExtensionTestCommon.jsm b/toolkit/components/webextensions/ExtensionTestCommon.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionTestCommon.jsm rename to toolkit/components/webextensions/ExtensionTestCommon.jsm diff --git a/toolkit/components/extensions/ExtensionUtils.jsm b/toolkit/components/webextensions/ExtensionUtils.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionUtils.jsm rename to toolkit/components/webextensions/ExtensionUtils.jsm diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm b/toolkit/components/webextensions/ExtensionXPCShellUtils.jsm similarity index 100% rename from toolkit/components/extensions/ExtensionXPCShellUtils.jsm rename to toolkit/components/webextensions/ExtensionXPCShellUtils.jsm diff --git a/toolkit/components/extensions/LegacyExtensionsUtils.jsm b/toolkit/components/webextensions/LegacyExtensionsUtils.jsm similarity index 100% rename from toolkit/components/extensions/LegacyExtensionsUtils.jsm rename to toolkit/components/webextensions/LegacyExtensionsUtils.jsm diff --git a/toolkit/components/extensions/MessageChannel.jsm b/toolkit/components/webextensions/MessageChannel.jsm similarity index 100% rename from toolkit/components/extensions/MessageChannel.jsm rename to toolkit/components/webextensions/MessageChannel.jsm diff --git a/toolkit/components/extensions/NativeMessaging.jsm b/toolkit/components/webextensions/NativeMessaging.jsm similarity index 100% rename from toolkit/components/extensions/NativeMessaging.jsm rename to toolkit/components/webextensions/NativeMessaging.jsm diff --git a/toolkit/components/extensions/Schemas.jsm b/toolkit/components/webextensions/Schemas.jsm similarity index 100% rename from toolkit/components/extensions/Schemas.jsm rename to toolkit/components/webextensions/Schemas.jsm diff --git a/toolkit/components/extensions/ext-alarms.js b/toolkit/components/webextensions/ext-alarms.js similarity index 100% rename from toolkit/components/extensions/ext-alarms.js rename to toolkit/components/webextensions/ext-alarms.js diff --git a/toolkit/components/extensions/ext-backgroundPage.js b/toolkit/components/webextensions/ext-backgroundPage.js similarity index 100% rename from toolkit/components/extensions/ext-backgroundPage.js rename to toolkit/components/webextensions/ext-backgroundPage.js diff --git a/toolkit/components/extensions/ext-browser-content.js b/toolkit/components/webextensions/ext-browser-content.js similarity index 100% rename from toolkit/components/extensions/ext-browser-content.js rename to 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 similarity index 100% rename from toolkit/components/extensions/ext-c-backgroundPage.js rename to 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 similarity index 100% rename from toolkit/components/extensions/ext-c-extension.js rename to 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 similarity index 100% rename from toolkit/components/extensions/ext-c-runtime.js rename to 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 similarity index 100% rename from toolkit/components/extensions/ext-c-storage.js rename to 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 similarity index 100% rename from toolkit/components/extensions/ext-c-test.js rename to toolkit/components/webextensions/ext-c-test.js diff --git a/toolkit/components/extensions/ext-cookies.js b/toolkit/components/webextensions/ext-cookies.js similarity index 100% rename from toolkit/components/extensions/ext-cookies.js rename to toolkit/components/webextensions/ext-cookies.js diff --git a/toolkit/components/extensions/ext-downloads.js b/toolkit/components/webextensions/ext-downloads.js similarity index 100% rename from toolkit/components/extensions/ext-downloads.js rename to toolkit/components/webextensions/ext-downloads.js diff --git a/toolkit/components/extensions/ext-extension.js b/toolkit/components/webextensions/ext-extension.js similarity index 100% rename from toolkit/components/extensions/ext-extension.js rename to toolkit/components/webextensions/ext-extension.js diff --git a/toolkit/components/extensions/ext-i18n.js b/toolkit/components/webextensions/ext-i18n.js similarity index 100% rename from toolkit/components/extensions/ext-i18n.js rename to toolkit/components/webextensions/ext-i18n.js diff --git a/toolkit/components/extensions/ext-idle.js b/toolkit/components/webextensions/ext-idle.js similarity index 100% rename from toolkit/components/extensions/ext-idle.js rename to toolkit/components/webextensions/ext-idle.js diff --git a/toolkit/components/extensions/ext-management.js b/toolkit/components/webextensions/ext-management.js similarity index 100% rename from toolkit/components/extensions/ext-management.js rename to toolkit/components/webextensions/ext-management.js diff --git a/toolkit/components/extensions/ext-notifications.js b/toolkit/components/webextensions/ext-notifications.js similarity index 100% rename from toolkit/components/extensions/ext-notifications.js rename to toolkit/components/webextensions/ext-notifications.js diff --git a/toolkit/components/extensions/ext-runtime.js b/toolkit/components/webextensions/ext-runtime.js similarity index 100% rename from toolkit/components/extensions/ext-runtime.js rename to toolkit/components/webextensions/ext-runtime.js diff --git a/toolkit/components/extensions/ext-storage.js b/toolkit/components/webextensions/ext-storage.js similarity index 100% rename from toolkit/components/extensions/ext-storage.js rename to toolkit/components/webextensions/ext-storage.js diff --git a/toolkit/components/extensions/ext-topSites.js b/toolkit/components/webextensions/ext-topSites.js similarity index 100% rename from toolkit/components/extensions/ext-topSites.js rename to toolkit/components/webextensions/ext-topSites.js diff --git a/toolkit/components/extensions/ext-webNavigation.js b/toolkit/components/webextensions/ext-webNavigation.js similarity index 100% rename from toolkit/components/extensions/ext-webNavigation.js rename to toolkit/components/webextensions/ext-webNavigation.js diff --git a/toolkit/components/extensions/ext-webRequest.js b/toolkit/components/webextensions/ext-webRequest.js similarity index 100% rename from toolkit/components/extensions/ext-webRequest.js rename to toolkit/components/webextensions/ext-webRequest.js diff --git a/toolkit/components/extensions/extensions-toolkit.manifest b/toolkit/components/webextensions/extensions-toolkit.manifest similarity index 100% rename from toolkit/components/extensions/extensions-toolkit.manifest rename to toolkit/components/webextensions/extensions-toolkit.manifest diff --git a/toolkit/components/extensions/jar.mn b/toolkit/components/webextensions/jar.mn similarity index 100% rename from toolkit/components/extensions/jar.mn rename to toolkit/components/webextensions/jar.mn diff --git a/toolkit/components/extensions/moz.build b/toolkit/components/webextensions/moz.build similarity index 100% rename from toolkit/components/extensions/moz.build rename to toolkit/components/webextensions/moz.build diff --git a/toolkit/components/extensions/schemas/LICENSE b/toolkit/components/webextensions/schemas/LICENSE similarity index 100% rename from toolkit/components/extensions/schemas/LICENSE rename to toolkit/components/webextensions/schemas/LICENSE diff --git a/toolkit/components/extensions/schemas/alarms.json b/toolkit/components/webextensions/schemas/alarms.json similarity index 100% rename from toolkit/components/extensions/schemas/alarms.json rename to toolkit/components/webextensions/schemas/alarms.json diff --git a/toolkit/components/extensions/schemas/cookies.json b/toolkit/components/webextensions/schemas/cookies.json similarity index 100% rename from toolkit/components/extensions/schemas/cookies.json rename to toolkit/components/webextensions/schemas/cookies.json diff --git a/toolkit/components/extensions/schemas/downloads.json b/toolkit/components/webextensions/schemas/downloads.json similarity index 100% rename from toolkit/components/extensions/schemas/downloads.json rename to toolkit/components/webextensions/schemas/downloads.json diff --git a/toolkit/components/extensions/schemas/events.json b/toolkit/components/webextensions/schemas/events.json similarity index 100% rename from toolkit/components/extensions/schemas/events.json rename to toolkit/components/webextensions/schemas/events.json diff --git a/toolkit/components/extensions/schemas/experiments.json b/toolkit/components/webextensions/schemas/experiments.json similarity index 100% rename from toolkit/components/extensions/schemas/experiments.json rename to toolkit/components/webextensions/schemas/experiments.json diff --git a/toolkit/components/extensions/schemas/extension.json b/toolkit/components/webextensions/schemas/extension.json similarity index 100% rename from toolkit/components/extensions/schemas/extension.json rename to toolkit/components/webextensions/schemas/extension.json diff --git a/toolkit/components/extensions/schemas/extension_types.json b/toolkit/components/webextensions/schemas/extension_types.json similarity index 100% rename from toolkit/components/extensions/schemas/extension_types.json rename to toolkit/components/webextensions/schemas/extension_types.json diff --git a/toolkit/components/extensions/schemas/i18n.json b/toolkit/components/webextensions/schemas/i18n.json similarity index 100% rename from toolkit/components/extensions/schemas/i18n.json rename to toolkit/components/webextensions/schemas/i18n.json diff --git a/toolkit/components/extensions/schemas/idle.json b/toolkit/components/webextensions/schemas/idle.json similarity index 100% rename from toolkit/components/extensions/schemas/idle.json rename to toolkit/components/webextensions/schemas/idle.json diff --git a/toolkit/components/extensions/schemas/jar.mn b/toolkit/components/webextensions/schemas/jar.mn similarity index 100% rename from toolkit/components/extensions/schemas/jar.mn rename to toolkit/components/webextensions/schemas/jar.mn diff --git a/toolkit/components/extensions/schemas/management.json b/toolkit/components/webextensions/schemas/management.json similarity index 100% rename from toolkit/components/extensions/schemas/management.json rename to toolkit/components/webextensions/schemas/management.json diff --git a/toolkit/components/extensions/schemas/manifest.json b/toolkit/components/webextensions/schemas/manifest.json similarity index 100% rename from toolkit/components/extensions/schemas/manifest.json rename to toolkit/components/webextensions/schemas/manifest.json diff --git a/toolkit/components/extensions/schemas/moz.build b/toolkit/components/webextensions/schemas/moz.build similarity index 100% rename from toolkit/components/extensions/schemas/moz.build rename to 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 similarity index 100% rename from toolkit/components/extensions/schemas/native_host_manifest.json rename to toolkit/components/webextensions/schemas/native_host_manifest.json diff --git a/toolkit/components/extensions/schemas/notifications.json b/toolkit/components/webextensions/schemas/notifications.json similarity index 100% rename from toolkit/components/extensions/schemas/notifications.json rename to toolkit/components/webextensions/schemas/notifications.json diff --git a/toolkit/components/extensions/schemas/runtime.json b/toolkit/components/webextensions/schemas/runtime.json similarity index 100% rename from toolkit/components/extensions/schemas/runtime.json rename to toolkit/components/webextensions/schemas/runtime.json diff --git a/toolkit/components/extensions/schemas/storage.json b/toolkit/components/webextensions/schemas/storage.json similarity index 100% rename from toolkit/components/extensions/schemas/storage.json rename to toolkit/components/webextensions/schemas/storage.json diff --git a/toolkit/components/extensions/schemas/test.json b/toolkit/components/webextensions/schemas/test.json similarity index 100% rename from toolkit/components/extensions/schemas/test.json rename to toolkit/components/webextensions/schemas/test.json diff --git a/toolkit/components/extensions/schemas/top_sites.json b/toolkit/components/webextensions/schemas/top_sites.json similarity index 100% rename from toolkit/components/extensions/schemas/top_sites.json rename to 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 similarity index 100% rename from toolkit/components/extensions/schemas/web_navigation.json rename to 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 similarity index 100% rename from toolkit/components/extensions/schemas/web_request.json rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/.eslintrc.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/chrome.ini rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/chrome_head.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_WebNavigation_page1.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_WebNavigation_page2.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_WebNavigation_page3.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_WebRequest_page3.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_csp.html rename to 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^ similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_csp.html^headers^ rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_image_bad.png rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_image_good.png rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_image_redirect.png rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_mixed.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_permission_xhr.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_privilege_escalation.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_sample.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_script_bad.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_script_good.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_script_redirect.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_script_xhr.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_style_bad.css rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_style_good.css rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_style_redirect.css rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_teardown_test.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html rename to 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^ similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_clientRedirect_httpHeaders.html^headers^ rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_frameClientRedirect.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_frameRedirect.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe_page1.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_webNavigation_manualSubframe_page2.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/file_with_about_blank.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/head.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/head_cookies.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/head_webrequest.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/mochitest.ini rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/redirection.sjs rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/return_headers.sjs rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_background_debug_global.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_background_page.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_contentscript_unrecognizedprop_warning.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_downloads_saveAs.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_eventpage_warning.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_hybrid_addons.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_idle.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_shutdown_cleanup.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_storage_cleanup.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_trustworthy_origin.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_ext_webrequest_background_events.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_chrome_native_messaging_paths.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_clipboard.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_all_apis.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_background_api_injection.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_background_canvas.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_background_generated_url.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_background_teardown.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_content_security_policy.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_about_blank.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_api_injection.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_async_loading.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_context.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_css.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_devtools_metadata.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_exporthelpers.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_incognito.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_permission.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_contentscript_teardown.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_cookies.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_cookies_containers.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_exclude_include_globs.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_generate.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_geturl.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_i18n.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_i18n_css.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_inIncognitoContext_window.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_jsversion.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_listener_proxies.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_notifications.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_permission_xhr.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_runtime_connect.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_runtime_connect2.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_runtime_connect_twoway.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_runtime_disconnect.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_runtime_id.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_sandbox_var.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_schema.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_sendmessage_doublereply.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_sendmessage_no_receiver.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_sendmessage_reply.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_sendmessage_reply2.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_storage_content.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_storage_tab.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_subframes_privileges.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_tab_teardown.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_test.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_unload_frame.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_web_accessible_resources.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_webnavigation.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_webnavigation_filters.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_webrequest_background_events.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_webrequest_suspend.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_webrequest_upload.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_window_postMessage.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/test_ext_xhr_capabilities.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/webrequest_chromeworker.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/webrequest_test.jsm rename to 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 similarity index 100% rename from toolkit/components/extensions/test/mochitest/webrequest_worker.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/.eslintrc.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/data/file_download.html rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/data/file_download.txt rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/head.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/head_native_messaging.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/head_sync.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/native_messaging.ini rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_csp_custom_policies.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_csp_validator.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_alarms.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_alarms_does_not_fire.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_alarms_periodic.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_alarms_replaces.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_api_permissions.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_apimanager.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_generated_load_events.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_generated_reload.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_global_history.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_private_browsing.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_runtime_connect_params.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_sub_windows.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_background_window_properties.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_contexts.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_downloads.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_downloads_download.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_downloads_search.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_experiments.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_extension.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_idle.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_json_parser.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_context.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_legacy_extension_embedding.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_localStorage.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_management.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_management_uninstall_self.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_manifest_content_security_policy.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_manifest_incognito.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_manifest_minimum_chrome_version.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_native_messaging.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_perf.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_native_messaging_unresponsive.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_onmessage_removelistener.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_connect_no_receiver.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_getBrowserInfo.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_getPlatformInfo.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_onInstalled_and_onStartup.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_errors.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_no_receiver.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_runtime_sendMessage_self.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_schemas.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_schemas_allowed_contexts.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_schemas_api_injection.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_schemas_async.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_simple.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_storage.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_ext_topSites.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_getAPILevelForWindow.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_locale_converter.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_locale_data.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/test_native_messaging.js rename to 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 similarity index 100% rename from toolkit/components/extensions/test/xpcshell/xpcshell.ini rename to toolkit/components/webextensions/test/xpcshell/xpcshell.ini