From 4fb11cd5966461bccc3ed1599b808237be6b0de9 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 10 Feb 2018 02:49:12 -0500 Subject: [PATCH] Move WebExtensions enabled Add-ons Manager --- .../experiments/test/xpcshell/xpcshell.ini | 2 +- services/sync/tests/unit/xpcshell.ini | 4 +- .../telemetry/tests/unit/xpcshell.ini | 2 +- .../{extensions => webextensions}/about.dtd | 0 .../blocklist.dtd | 0 .../extensions.dtd | 0 .../extensions.properties | 0 .../newaddon.dtd | 0 .../newaddon.properties | 0 .../{extensions => webextensions}/update.dtd | 0 .../update.properties | 0 .../xpinstallConfirm.dtd | 0 .../xpinstallConfirm.properties | 0 toolkit/locales/jar.mn | 24 ++++--- toolkit/moz.build | 4 +- .../.eslintrc.js | 0 .../AddonContentPolicy.cpp | 0 .../AddonContentPolicy.h | 0 .../AddonManager.jsm | 0 .../AddonManagerWebAPI.cpp | 0 .../AddonManagerWebAPI.h | 0 .../AddonPathService.cpp | 0 .../AddonPathService.h | 0 .../ChromeManifestParser.jsm | 0 .../DeferredSave.jsm | 0 .../LightweightThemeManager.jsm | 0 .../addonManager.js | 0 .../amContentHandler.js | 0 .../amIAddonManager.idl | 0 .../amIAddonPathService.idl | 0 .../amIWebInstallListener.idl | 0 .../amIWebInstaller.idl | 0 .../amInstallTrigger.js | 0 .../{extensions => webextensions}/amWebAPI.js | 0 .../amWebInstallListener.js | 0 .../content/OpenH264-license.txt | 0 .../content/about.js | 0 .../content/about.xul | 0 .../content/blocklist.css | 0 .../content/blocklist.js | 0 .../content/blocklist.xml | 0 .../content/blocklist.xul | 0 .../content/eula.js | 0 .../content/eula.xul | 0 .../content/extensions.css | 0 .../content/extensions.js | 0 .../content/extensions.xml | 0 .../content/extensions.xul | 0 .../content/gmpPrefs.xul | 0 .../content/list.js | 0 .../content/list.xul | 0 .../content/newaddon.js | 0 .../content/newaddon.xul | 0 .../content/pluginPrefs.xul | 0 .../content/setting.xml | 0 .../content/update.js | 0 .../content/update.xul | 0 .../content/updateinfo.xsl | 0 .../content/xpinstallConfirm.css | 0 .../content/xpinstallConfirm.js | 0 .../content/xpinstallConfirm.xul | 0 .../content/xpinstallItem.xml | 0 .../docs/SystemAddons.rst | 0 .../docs/index.rst | 0 .../extensions.manifest | 0 .../internal/APIExtensionBootstrap.js | 0 .../internal/AddonConstants.jsm | 0 .../internal/AddonLogging.jsm | 0 .../internal/AddonRepository.jsm | 0 .../AddonRepository_SQLiteMigrator.jsm | 0 .../internal/AddonTestUtils.jsm | 0 .../internal/AddonUpdateChecker.jsm | 0 .../internal/Content.js | 0 .../internal/E10SAddonsRollout.jsm | 0 .../internal/GMPProvider.jsm | 0 .../LightweightThemeImageOptimizer.jsm | 0 .../internal/PluginProvider.jsm | 0 .../internal/ProductAddonChecker.jsm | 0 .../internal/SpellCheckDictionaryBootstrap.js | 0 .../internal/WebExtensionBootstrap.js | 0 .../internal/XPIProvider.jsm | 0 .../internal/XPIProviderUtils.js | 0 .../internal/moz.build | 0 .../{extensions => webextensions}/jar.mn | 0 .../{extensions => webextensions}/moz.build | 0 .../nsBlocklistService.js | 0 .../nsBlocklistServiceContent.js | 0 .../test/AddonManagerTesting.jsm | 0 .../test/Makefile.in | 0 .../test/addons/blocklist_hard1_1/install.rdf | 0 .../test/addons/blocklist_hard1_2/install.rdf | 0 .../test/addons/blocklist_hard1_3/install.rdf | 0 .../addons/blocklist_regexp1_1/install.rdf | 0 .../addons/blocklist_regexp1_2/install.rdf | 0 .../addons/blocklist_regexp1_3/install.rdf | 0 .../test/addons/blocklist_soft1_1/install.rdf | 0 .../test/addons/blocklist_soft1_2/install.rdf | 0 .../test/addons/blocklist_soft1_3/install.rdf | 0 .../test/addons/blocklist_soft2_1/install.rdf | 0 .../test/addons/blocklist_soft2_2/install.rdf | 0 .../test/addons/blocklist_soft2_3/install.rdf | 0 .../test/addons/blocklist_soft3_1/install.rdf | 0 .../test/addons/blocklist_soft3_2/install.rdf | 0 .../test/addons/blocklist_soft3_3/install.rdf | 0 .../test/addons/blocklist_soft4_1/install.rdf | 0 .../test/addons/blocklist_soft4_2/install.rdf | 0 .../test/addons/blocklist_soft4_3/install.rdf | 0 .../test/addons/blocklist_soft5_1/install.rdf | 0 .../test/addons/blocklist_soft5_2/install.rdf | 0 .../test/addons/blocklist_soft5_3/install.rdf | 0 .../addons/bootstrap_globals/bootstrap.js | 0 .../test/addons/bootstrap_globals/install.rdf | 0 .../test/addons/min1max1/install.rdf | 0 .../test/addons/min1max2/install.rdf | 0 .../test/addons/min1max3/install.rdf | 0 .../test/addons/min1max3b/install.rdf | 0 .../test/addons/override1x2-1x3/install.rdf | 0 .../addons/test_AddonRepository_1/install.rdf | 0 .../addons/test_AddonRepository_2/install.rdf | 0 .../addons/test_AddonRepository_3/icon.png | 0 .../addons/test_AddonRepository_3/install.rdf | 0 .../addons/test_AddonRepository_3/preview.png | 0 .../addons/test_bootstrap1_1/bootstrap.js | 0 .../test/addons/test_bootstrap1_1/install.rdf | 0 .../test/addons/test_bootstrap1_1/version.jsm | 0 .../addons/test_bootstrap1_2/bootstrap.js | 0 .../test/addons/test_bootstrap1_2/install.rdf | 0 .../test/addons/test_bootstrap1_2/version.jsm | 0 .../addons/test_bootstrap1_3/bootstrap.js | 0 .../test/addons/test_bootstrap1_3/install.rdf | 0 .../test/addons/test_bootstrap1_3/version.jsm | 0 .../test/addons/test_bootstrap1_4/install.rdf | 0 .../addons/test_bootstrap2_1/bootstrap.js | 0 .../test/addons/test_bootstrap2_1/install.rdf | 0 .../addons/test_bootstrap_const/bootstrap.js | 0 .../addons/test_bootstrap_const/install.rdf | 0 .../test/addons/test_bug299716_2/install.rdf | 0 .../addons/test_bug299716_a_1/install.rdf | 0 .../addons/test_bug299716_a_2/install.rdf | 0 .../addons/test_bug299716_b_1/install.rdf | 0 .../addons/test_bug299716_b_2/install.rdf | 0 .../addons/test_bug299716_c_1/install.rdf | 0 .../addons/test_bug299716_c_2/install.rdf | 0 .../addons/test_bug299716_d_1/install.rdf | 0 .../addons/test_bug299716_d_2/install.rdf | 0 .../addons/test_bug299716_e_1/install.rdf | 0 .../addons/test_bug299716_e_2/install.rdf | 0 .../addons/test_bug299716_f_1/install.rdf | 0 .../addons/test_bug299716_f_2/install.rdf | 0 .../addons/test_bug299716_g_1/install.rdf | 0 .../addons/test_bug299716_g_2/install.rdf | 0 .../test/addons/test_bug324121_1/install.rdf | 0 .../test/addons/test_bug324121_2/install.rdf | 0 .../test/addons/test_bug324121_3/install.rdf | 0 .../test/addons/test_bug324121_4/install.rdf | 0 .../test/addons/test_bug324121_5/install.rdf | 0 .../test/addons/test_bug324121_6/install.rdf | 0 .../test/addons/test_bug324121_7/install.rdf | 0 .../test/addons/test_bug324121_8/install.rdf | 0 .../test/addons/test_bug324121_9/install.rdf | 0 .../test/addons/test_bug335238_1/install.rdf | 0 .../test/addons/test_bug335238_2/install.rdf | 0 .../test/addons/test_bug335238_3/install.rdf | 0 .../test/addons/test_bug335238_4/install.rdf | 0 .../test/addons/test_bug371495/install.rdf | 0 .../test/addons/test_bug394300_1/install.rdf | 0 .../test/addons/test_bug394300_2/install.rdf | 0 .../test/addons/test_bug397778/install.rdf | 0 .../test/addons/test_bug425657/install.rdf | 0 .../test/addons/test_bug470377_1/install.rdf | 0 .../test/addons/test_bug470377_2/install.rdf | 0 .../test/addons/test_bug470377_3/install.rdf | 0 .../test/addons/test_bug470377_4/install.rdf | 0 .../test/addons/test_bug470377_5/install.rdf | 0 .../test/addons/test_bug521905/install.rdf | 0 .../test/addons/test_bug567173/install.rdf | 0 .../test/addons/test_bug567184/bootstrap.js | 0 .../test/addons/test_bug567184/install.rdf | 0 .../test/addons/test_bug587088_1/install.rdf | 0 .../test/addons/test_bug587088_1/testfile | 0 .../test/addons/test_bug587088_1/testfile1 | 0 .../test/addons/test_bug587088_2/install.rdf | 0 .../test/addons/test_bug587088_2/testfile | 0 .../test/addons/test_bug587088_2/testfile2 | 0 .../addons/test_bug594058/directory/file1 | 0 .../test/addons/test_bug594058/install.rdf | 0 .../test/addons/test_bug595573/install.rdf | 0 .../test/addons/test_bug655254/install.rdf | 0 .../test/addons/test_bug655254_2/bootstrap.js | 0 .../test/addons/test_bug655254_2/install.rdf | 0 .../test/addons/test_bug659772/install.rdf | 0 .../addons/test_bug675371/chrome.manifest | 0 .../test/addons/test_bug675371/install.rdf | 0 .../test/addons/test_bug675371/test.js | 0 .../test/addons/test_bug740612_1/bootstrap.js | 0 .../test/addons/test_bug740612_1/install.rdf | 0 .../test/addons/test_bug740612_2/bootstrap.js | 0 .../test/addons/test_bug740612_2/install.rdf | 0 .../test/addons/test_bug757663/install.rdf | 0 .../test/addons/test_cacheflush1/install.rdf | 0 .../test/addons/test_cacheflush2/install.rdf | 0 .../test_chromemanifest_1/chrome.manifest | 0 .../addons/test_chromemanifest_1/install.rdf | 0 .../test_chromemanifest_2/chrome.manifest | 0 .../addons/test_chromemanifest_2/install.rdf | 0 .../test_chromemanifest_3/chrome.manifest | 0 .../addons/test_chromemanifest_3/inner.jar | Bin .../addons/test_chromemanifest_3/install.rdf | 0 .../test_chromemanifest_4/chrome.manifest | 0 .../components/components.manifest | 0 .../components/other/something.manifest | 0 .../addons/test_chromemanifest_4/install.rdf | 0 .../test_chromemanifest_5/chrome.manifest | 0 .../addons/test_chromemanifest_5/install.rdf | 0 .../test_chromemanifest_6/chrome.manifest | 0 .../addons/test_chromemanifest_6/install.rdf | 0 .../addons/test_data_directory/install.rdf | 0 .../addons/test_db_sanity_1_1/install.rdf | 0 .../addons/test_db_sanity_1_2/install.rdf | 0 .../bootstrap.js | 0 .../test_delay_update_complete_v2/install.rdf | 0 .../manifest.json | 0 .../test_delay_update_defer_v2/bootstrap.js | 0 .../test_delay_update_defer_v2/install.rdf | 0 .../manifest.json | 0 .../test_delay_update_ignore_v2/bootstrap.js | 0 .../test_delay_update_ignore_v2/install.rdf | 0 .../manifest.json | 0 .../addons/test_dictionary/chrome.manifest | 0 .../test_dictionary/dictionaries/ab-CD.dic | 0 .../test/addons/test_dictionary/install.rdf | 0 .../test_dictionary_2/dictionaries/ab-CD.dic | 0 .../test/addons/test_dictionary_2/install.rdf | 0 .../test/addons/test_dictionary_3/install.rdf | 0 .../test/addons/test_dictionary_4/install.rdf | 0 .../test/addons/test_dictionary_5/install.rdf | 0 .../addons/test_distribution1_2/install.rdf | 0 .../test/addons/test_experiment1/bootstrap.js | 0 .../test/addons/test_experiment1/install.rdf | 0 .../test/addons/test_filepointer/install.rdf | 0 .../test/addons/test_getresource/icon.png | 0 .../test/addons/test_getresource/install.rdf | 0 .../test_getresource/subdir/subfile.txt | 0 .../test/addons/test_hotfix_1/install.rdf | 0 .../test/addons/test_hotfix_2/install.rdf | 0 .../test/addons/test_install1/icon.png | 0 .../test/addons/test_install1/icon64.png | 0 .../test/addons/test_install1/install.rdf | 0 .../test/addons/test_install2_1/icon.png | 0 .../test/addons/test_install2_1/install.rdf | 0 .../test/addons/test_install2_2/install.rdf | 0 .../test/addons/test_install3/install.rdf | 0 .../test/addons/test_install4/addon4.xpi | Bin .../test/addons/test_install4/addon5.jar | Bin .../test/addons/test_install4/addon6.xpi | Bin .../test/addons/test_install4/addon7.jar | Bin .../test/addons/test_install4/badaddon.jar | 0 .../test/addons/test_install4/badaddon.xpi | 0 .../test/addons/test_install4/icon.png | 0 .../test/addons/test_install4/install.rdf | 0 .../test/addons/test_install5/chrome.manifest | 0 .../test/addons/test_install5/install.rdf | 0 .../test/addons/test_install6/install.rdf | 0 .../test/addons/test_install7/addon1.xpi | 0 .../test/addons/test_install7/addon2.xpi | 0 .../test/addons/test_install7/install.rdf | 0 .../test/addons/test_install8/install.rdf | 0 .../test/addons/test_jetpack/bootstrap.js | 0 .../addons/test_jetpack/harness-options.json | 0 .../test/addons/test_jetpack/install.rdf | 0 .../test/addons/test_langpack/chrome.manifest | 0 .../test/addons/test_langpack/install.rdf | 0 .../test/addons/test_locale/install.rdf | 0 .../test/addons/test_locked2_5/install.rdf | 0 .../test/addons/test_locked2_6/install.rdf | 0 .../test/addons/test_migrate4_6/install.rdf | 0 .../test/addons/test_migrate4_7/install.rdf | 0 .../test/addons/test_migrate6/install.rdf | 0 .../test/addons/test_migrate7/install.rdf | 0 .../test/addons/test_migrate8/chrome.manifest | 0 .../test/addons/test_migrate8/install.rdf | 0 .../test/addons/test_migrate9/install.rdf | 0 .../test/addons/test_symbol/bootstrap.js | 0 .../test/addons/test_symbol/install.rdf | 0 .../test/addons/test_theme/install.rdf | 0 .../test/addons/test_theme/preview.png | 0 .../addons/test_undoincompatible/bootstrap.js | 0 .../addons/test_undoincompatible/install.rdf | 0 .../addons/test_undouninstall1/bootstrap.js | 0 .../addons/test_undouninstall1/install.rdf | 0 .../test/addons/test_update/install.rdf | 0 .../test/addons/test_update12/install.rdf | 0 .../test/addons/test_update8/install.rdf | 0 .../addons/test_update_multi1/bootstrap.js | 0 .../addons/test_update_multi1/install.rdf | 0 .../test/addons/test_update_multi2/addon.xpi | Bin .../addons/test_update_multi2/install.rdf | 0 .../test/addons/test_updateid1/bootstrap.js | 0 .../test/addons/test_updateid1/install.rdf | 0 .../test/addons/test_updateid2/bootstrap.js | 0 .../test/addons/test_updateid2/install.rdf | 0 .../addons/upgradeable1x2-3_1/install.rdf | 0 .../addons/upgradeable1x2-3_2/install.rdf | 0 .../addons/webextension_1/chrome.manifest | 0 .../test/addons/webextension_1/manifest.json | 0 .../test/addons/webextension_2/install.rdf | 0 .../test/addons/webextension_2/manifest.json | 0 .../webextension_3/_locales/en/messages.json | 0 .../webextension_3/_locales/fr/messages.json | 0 .../test/addons/webextension_3/manifest.json | 0 .../test/browser/.eslintrc.js | 0 .../test/browser/addon_about.xul | 0 .../test/browser/addon_prefs.xul | 0 .../browser/addons/browser_bug557956_1.xpi | Bin .../addons/browser_bug557956_1/install.rdf | 0 .../browser/addons/browser_bug557956_10.xpi | Bin .../addons/browser_bug557956_10/install.rdf | 0 .../browser/addons/browser_bug557956_2.xpi | Bin .../addons/browser_bug557956_2/install.rdf | 0 .../browser/addons/browser_bug557956_3.xpi | Bin .../addons/browser_bug557956_3/install.rdf | 0 .../browser/addons/browser_bug557956_4.xpi | Bin .../addons/browser_bug557956_4/install.rdf | 0 .../browser/addons/browser_bug557956_5.xpi | Bin .../addons/browser_bug557956_5/install.rdf | 0 .../browser/addons/browser_bug557956_6.xpi | Bin .../addons/browser_bug557956_6/install.rdf | 0 .../browser/addons/browser_bug557956_7.xpi | Bin .../addons/browser_bug557956_7/install.rdf | 0 .../browser/addons/browser_bug557956_8_1.xpi | Bin .../addons/browser_bug557956_8_1/install.rdf | 0 .../browser/addons/browser_bug557956_9_1.xpi | Bin .../addons/browser_bug557956_9_1/install.rdf | 0 .../browser/addons/browser_bug567127_1.xpi | Bin .../addons/browser_bug567127_1/install.rdf | 0 .../browser/addons/browser_bug567127_2.xpi | Bin .../addons/browser_bug567127_2/install.rdf | 0 .../browser/addons/browser_bug596336_1.xpi | Bin .../addons/browser_bug596336_1/install.rdf | 0 .../browser/addons/browser_bug596336_2.xpi | Bin .../addons/browser_bug596336_2/install.rdf | 0 .../test/browser/addons/browser_dragdrop1.xpi | Bin .../addons/browser_dragdrop1/install.rdf | 0 .../test/browser/addons/browser_dragdrop2.xpi | Bin .../addons/browser_dragdrop2/install.rdf | 0 .../browser/addons/browser_experiment1.xpi | Bin .../addons/browser_experiment1/install.rdf | 0 .../addons/browser_inlinesettings1.xpi | Bin .../browser_inlinesettings1/bootstrap.js | 0 .../browser_inlinesettings1/chrome.manifest | 0 .../browser_inlinesettings1/install.rdf | 0 .../browser_inlinesettings1/options.xul | 0 .../browser_inlinesettings1/settings.dtd | 0 .../addons/browser_inlinesettings1_custom.xpi | Bin .../binding.xml | 0 .../bootstrap.js | 0 .../chrome.manifest | 0 .../install.rdf | 0 .../options.xul | 0 .../browser_inlinesettings1_custom/string.dtd | 0 .../addons/browser_inlinesettings1_info.xpi | Bin .../browser_inlinesettings1_info/bootstrap.js | 0 .../browser_inlinesettings1_info/install.rdf | 0 .../browser_inlinesettings1_info/options.xul | 0 .../browser/addons/browser_install1_1.xpi | Bin .../addons/browser_install1_1/install.rdf | 0 .../browser/addons/browser_install1_2.xpi | Bin .../addons/browser_install1_2/install.rdf | 0 .../browser/addons/browser_installssl.xpi | Bin .../addons/browser_installssl/install.rdf | 0 .../test/browser/addons/browser_searching.xpi | Bin .../addons/browser_searching/bootstrap.js | 0 .../addons/browser_searching/install.rdf | 0 .../test/browser/addons/browser_update1_1.xpi | Bin .../addons/browser_update1_1/bootstrap.js | 0 .../addons/browser_update1_1/chrome.manifest | 0 .../addons/browser_update1_1/frame-script.js | 0 .../addons/browser_update1_1/install.rdf | 0 .../test/browser/addons/browser_update1_2.xpi | Bin .../addons/browser_update1_2/bootstrap.js | 0 .../addons/browser_update1_2/chrome.manifest | 0 .../addons/browser_update1_2/frame-script.js | 0 .../addons/browser_update1_2/install.rdf | 0 .../browser/addons/browser_webapi_install.xpi | Bin .../browser_webapi_install/bootstrap.js | 0 .../addons/browser_webapi_install/install.rdf | 0 .../test/browser/addons/options_signed.xpi | Bin .../addons/options_signed/manifest.json | 0 .../addons/options_signed/options.html | 0 .../test/browser/blockNoPlugins.xml | 0 .../test/browser/blockPluginHard.xml | 0 .../test/browser/browser-common.ini | 0 .../test/browser/browser-window.ini | 0 .../test/browser/browser.ini | 0 .../test/browser/browser_CTP_plugins.js | 0 .../test/browser/browser_about.js | 0 .../browser_addonrepository_performance.js | 0 .../test/browser/browser_bug523784.js | 0 .../test/browser/browser_bug557943.js | 0 .../test/browser/browser_bug557956.js | 0 .../test/browser/browser_bug557956.rdf | 0 .../test/browser/browser_bug557956.xml | 0 .../test/browser/browser_bug557956_8_2.xpi | Bin .../test/browser/browser_bug557956_9_2.xpi | Bin .../test/browser/browser_bug562797.js | 0 .../test/browser/browser_bug562854.js | 0 .../test/browser/browser_bug562890.js | 0 .../test/browser/browser_bug562899.js | 0 .../test/browser/browser_bug562992.js | 0 .../test/browser/browser_bug567127.js | 0 .../test/browser/browser_bug567137.js | 0 .../test/browser/browser_bug570760.js | 0 .../test/browser/browser_bug572561.js | 0 .../test/browser/browser_bug573062.js | 0 .../test/browser/browser_bug577990.js | 0 .../test/browser/browser_bug580298.js | 0 .../test/browser/browser_bug581076.js | 0 .../test/browser/browser_bug586574.js | 0 .../test/browser/browser_bug587970.js | 0 .../test/browser/browser_bug590347.js | 0 .../test/browser/browser_bug591465.js | 0 .../test/browser/browser_bug591465.xml | 0 .../test/browser/browser_bug591663.js | 0 .../test/browser/browser_bug593535.js | 0 .../test/browser/browser_bug593535.xml | 0 .../test/browser/browser_bug596336.js | 0 .../test/browser/browser_bug608316.js | 0 .../test/browser/browser_bug610764.js | 0 .../test/browser/browser_bug616841.js | 0 .../test/browser/browser_bug618502.js | 0 .../test/browser/browser_bug679604.js | 0 .../test/browser/browser_bug714593.js | 0 .../test/browser/browser_cancelCompatCheck.js | 0 .../browser_checkAddonCompatibility.js | 0 .../test/browser/browser_details.js | 0 .../test/browser/browser_discovery.js | 0 .../test/browser/browser_discovery_install.js | 0 .../test/browser/browser_dragdrop.js | 0 .../test/browser/browser_eula.js | 0 .../test/browser/browser_eula.xml | 0 .../test/browser/browser_experiments.js | 0 .../test/browser/browser_globalwarnings.js | 0 .../test/browser/browser_gmpProvider.js | 0 .../test/browser/browser_hotfix.js | 0 .../test/browser/browser_inlinesettings.js | 0 .../browser/browser_inlinesettings_browser.js | 0 .../browser/browser_inlinesettings_custom.js | 0 .../browser/browser_inlinesettings_info.js | 0 .../test/browser/browser_install.js | 0 .../test/browser/browser_install.rdf | 0 .../test/browser/browser_install.rdf^headers^ | 0 .../test/browser/browser_install.xml | 0 .../test/browser/browser_install1_3.xpi | Bin .../test/browser/browser_installssl.js | 0 .../test/browser/browser_list.js | 0 .../test/browser/browser_manualupdates.js | 0 .../test/browser/browser_metadataTimeout.js | 0 .../test/browser/browser_newaddon.js | 0 .../test/browser/browser_openDialog.js | 0 .../browser_plugin_enabled_state_locked.js | 0 .../test/browser/browser_pluginprefs.js | 0 .../test/browser/browser_purchase.js | 0 .../test/browser/browser_purchase.xml | 0 .../test/browser/browser_recentupdates.js | 0 .../test/browser/browser_searching.js | 0 .../test/browser/browser_searching.xml | 0 .../test/browser/browser_searching_empty.xml | 0 .../test/browser/browser_sorting.js | 0 .../test/browser/browser_sorting_plugins.js | 0 .../browser/browser_system_addons_are_e10s.js | 0 .../test/browser/browser_tabsettings.js | 0 .../test/browser/browser_task_next_test.js | 0 .../test/browser/browser_types.js | 0 .../test/browser/browser_uninstalling.js | 0 .../test/browser/browser_update.js | 0 .../test/browser/browser_updateid.js | 0 .../test/browser/browser_updatessl.js | 0 .../test/browser/browser_updatessl.rdf | 0 .../browser/browser_updatessl.rdf^headers^ | 0 .../test/browser/browser_webapi.js | 0 .../test/browser/browser_webapi_access.js | 0 .../browser/browser_webapi_addon_listener.js | 0 .../test/browser/browser_webapi_enable.js | 0 .../test/browser/browser_webapi_install.js | 0 .../test/browser/browser_webapi_uninstall.js | 0 .../test/browser/browser_webext_options.js | 0 .../test/browser/cancelCompatCheck.sjs | 0 .../test/browser/discovery.html | 0 .../test/browser/discovery_frame.html | 0 .../test/browser/discovery_install.html | 0 .../test/browser/head.js | 0 .../test/browser/more_options.xul | 0 .../test/browser/moz.build | 0 .../test/browser/options.xul | 0 .../test/browser/plugin_test.html | 0 .../test/browser/redirect.sjs | 0 .../test/browser/releaseNotes.xhtml | 0 .../test/browser/signed_hotfix.rdf | 0 .../test/browser/signed_hotfix.xpi | Bin .../test/browser/unsigned_hotfix.rdf | 0 .../test/browser/unsigned_hotfix.xpi | Bin .../test/browser/webapi_addon_listener.html | 0 .../test/browser/webapi_checkavailable.html | 0 .../test/browser/webapi_checkchromeframe.xul | 0 .../test/browser/webapi_checkframed.html | 0 .../browser/webapi_checknavigatedwindow.html | 0 .../test/mochitest/.eslintrc.js | 0 .../test/mochitest/file_bug687194.xpi | Bin .../test/mochitest/file_empty.html | 0 .../test/mochitest/mochitest.ini | 0 .../test/mochitest/test_bug609794.html | 0 .../test/mochitest/test_bug687194.html | 0 .../test/mochitest/test_bug887098.html | 0 .../test/moz.build | 0 .../test/xpcshell/.eslintrc.js | 0 .../test/xpcshell/data/BootstrapMonitor.jsm | 0 .../data/blocklistchange/addon_change.xml | 0 .../data/blocklistchange/addon_update1.rdf | 0 .../data/blocklistchange/addon_update2.rdf | 0 .../data/blocklistchange/addon_update3.rdf | 0 .../data/blocklistchange/app_update.xml | 0 .../blocklistchange/blocklist_update1.xml | 0 .../blocklistchange/blocklist_update2.xml | 0 .../data/blocklistchange/manual_update.xml | 0 .../test/xpcshell/data/bug455906_block.xml | 0 .../test/xpcshell/data/bug455906_empty.xml | 0 .../test/xpcshell/data/bug455906_start.xml | 0 .../test/xpcshell/data/bug455906_warn.xml | 0 .../test/xpcshell/data/corrupt.xpi | 0 .../test/xpcshell/data/corruptfile.xpi | Bin .../test/xpcshell/data/empty.xpi | Bin .../xpcshell/data/from_sources/bootstrap.js | 0 .../xpcshell/data/from_sources/install.rdf | 0 .../xpcshell/data/pluginInfoURL_block.xml | 0 .../test/xpcshell/data/productaddons/bad.txt | 0 .../test/xpcshell/data/productaddons/bad.xml | 0 .../test/xpcshell/data/productaddons/bad2.xml | 0 .../xpcshell/data/productaddons/empty.xml | 0 .../test/xpcshell/data/productaddons/good.xml | 0 .../xpcshell/data/productaddons/missing.xml | 0 .../xpcshell/data/productaddons/unsigned.xpi | Bin .../signing_checks/bootstrap_1/bootstrap.js | 0 .../signing_checks/bootstrap_1/install.rdf | 0 .../data/signing_checks/bootstrap_1/test.txt | 0 .../signing_checks/bootstrap_2/bootstrap.js | 0 .../signing_checks/bootstrap_2/install.rdf | 0 .../data/signing_checks/bootstrap_2/test.txt | 0 .../data/signing_checks/hotfix_badid.xpi | Bin .../data/signing_checks/hotfix_broken.xpi | Bin .../data/signing_checks/hotfix_good.xpi | Bin .../data/signing_checks/long_63_hash.xpi | Bin .../data/signing_checks/long_63_plain.xpi | Bin .../data/signing_checks/long_64_hash.xpi | Bin .../data/signing_checks/long_64_plain.xpi | Bin .../data/signing_checks/long_65_hash.xpi | Bin .../data/signing_checks/multi_badid.xpi | Bin .../data/signing_checks/multi_broken.xpi | Bin .../data/signing_checks/multi_signed.xpi | Bin .../data/signing_checks/multi_unsigned.xpi | Bin .../signing_checks/nonbootstrap_1/install.rdf | 0 .../signing_checks/nonbootstrap_1/test.txt | 0 .../signing_checks/nonbootstrap_2/install.rdf | 0 .../signing_checks/nonbootstrap_2/test.txt | 0 .../preliminary_bootstrap_2.xpi | Bin .../signing_checks/signed_bootstrap_1.xpi | Bin .../signing_checks/signed_bootstrap_2.xpi | Bin .../signed_bootstrap_badid_2.xpi | Bin .../signing_checks/signed_nonbootstrap_2.xpi | Bin .../signed_nonbootstrap_badid_2.xpi | Bin .../signing_checks/unsigned_bootstrap_2.xpi | Bin .../unsigned_nonbootstrap_2.xpi | Bin .../xpcshell/data/system_addons/bootstrap.js | 0 .../xpcshell/data/system_addons/system1_1.xpi | Bin .../data/system_addons/system1_1_badcert.xpi | Bin .../xpcshell/data/system_addons/system1_2.xpi | Bin .../xpcshell/data/system_addons/system2_1.xpi | Bin .../xpcshell/data/system_addons/system2_2.xpi | Bin .../xpcshell/data/system_addons/system2_3.xpi | Bin .../xpcshell/data/system_addons/system3_1.xpi | Bin .../xpcshell/data/system_addons/system3_2.xpi | Bin .../xpcshell/data/system_addons/system3_3.xpi | Bin .../xpcshell/data/system_addons/system4_1.xpi | Bin .../xpcshell/data/system_addons/system5_1.xpi | Bin .../data/system_addons/system6_1_unpack.xpi | Bin .../system_addons/system6_2_notBootstrap.xpi | Bin .../system6_3_notMultiprocess.xpi | Bin .../system_addons/system_delay_complete.xpi | Bin .../system_addons/system_delay_complete_2.xpi | Bin .../data/system_addons/system_delay_defer.xpi | Bin .../system_addons/system_delay_defer_2.xpi | Bin .../system_addons/system_delay_defer_also.xpi | Bin .../system_delay_defer_also_2.xpi | Bin .../system_addons/system_delay_ignore.xpi | Bin .../system_addons/system_delay_ignore_2.xpi | Bin .../system_addons/system_failed_update.xpi | Bin .../xpcshell/data/test_AddonRepository.xml | 0 .../data/test_AddonRepository_cache.xml | 0 ...test_AddonRepository_compatmode_ignore.xml | 0 ...test_AddonRepository_compatmode_normal.xml | 0 ...test_AddonRepository_compatmode_strict.xml | 0 .../data/test_AddonRepository_empty.xml | 0 .../data/test_AddonRepository_failed.xml | 0 .../test_AddonRepository_getAddonsByIDs.xml | 0 .../xpcshell/data/test_backgroundupdate.rdf | 0 .../test_blocklist_metadata_filters_1.xml | 0 .../xpcshell/data/test_blocklist_prefs_1.xml | 0 .../xpcshell/data/test_blocklist_regexp_1.xml | 0 .../test/xpcshell/data/test_bug299716.rdf | 0 .../test/xpcshell/data/test_bug299716_2.rdf | 0 .../test/xpcshell/data/test_bug324121.rdf | 0 .../test/xpcshell/data/test_bug393285.xml | 0 .../test/xpcshell/data/test_bug394300.rdf | 0 .../test/xpcshell/data/test_bug424262.xml | 0 .../test/xpcshell/data/test_bug449027_app.xml | 0 .../xpcshell/data/test_bug449027_toolkit.xml | 0 .../test/xpcshell/data/test_bug468528.xml | 0 .../data/test_bug470377/install_1.rdf | 0 .../data/test_bug470377/install_2.rdf | 0 .../data/test_bug470377/install_3.rdf | 0 .../data/test_bug470377/install_4.rdf | 0 .../data/test_bug470377/install_5.rdf | 0 .../xpcshell/data/test_bug470377/update_1.rdf | 0 .../xpcshell/data/test_bug470377/update_2.rdf | 0 .../xpcshell/data/test_bug470377/update_3.rdf | 0 .../xpcshell/data/test_bug470377/update_4.rdf | 0 .../xpcshell/data/test_bug470377/update_5.rdf | 0 .../test/xpcshell/data/test_bug514327_1.xml | 0 .../test/xpcshell/data/test_bug514327_2.xml | 0 .../xpcshell/data/test_bug514327_3_empty.xml | 0 .../data/test_bug514327_3_outdated_1.xml | 0 .../data/test_bug514327_3_outdated_2.xml | 0 .../test/xpcshell/data/test_bug526598_1.xpi | Bin .../test/xpcshell/data/test_bug526598_2.xpi | Bin .../test/xpcshell/data/test_bug541420.xpi | Bin .../test/xpcshell/data/test_bug542391.rdf | 0 .../test/xpcshell/data/test_bug554133.xml | 0 .../test/xpcshell/data/test_bug619730.xml | 0 .../test/xpcshell/data/test_bug655254.rdf | 0 .../xpcshell/data/test_compatoverrides.xml | 0 .../test/xpcshell/data/test_corrupt.rdf | 0 .../test_delay_update_complete/bootstrap.js | 0 .../data/test_delay_update_defer/bootstrap.js | 0 .../test_delay_update_ignore/bootstrap.js | 0 .../data/test_delay_updates_complete.json | 0 .../data/test_delay_updates_complete.rdf | 0 .../data/test_delay_updates_defer.json | 0 .../data/test_delay_updates_defer.rdf | 0 .../data/test_delay_updates_ignore.json | 0 .../data/test_delay_updates_ignore.rdf | 0 .../test/xpcshell/data/test_dictionary.rdf | 0 .../data/test_distribution2_2/bootstrap.js | 0 .../data/test_distribution2_2/install.rdf | 0 .../test_distribution2_2/subdir/dummy.txt | 0 .../subdir/subdir2/dummy2.txt | 0 .../test/xpcshell/data/test_gfxBlacklist.xml | 0 .../test/xpcshell/data/test_gfxBlacklist2.xml | 0 .../xpcshell/data/test_gfxBlacklist_AllOS.xml | 0 .../data/test_gfxBlacklist_OSVersion.xml | 0 .../test/xpcshell/data/test_hotfix_1.rdf | 0 .../test/xpcshell/data/test_hotfix_2.rdf | 0 .../test/xpcshell/data/test_hotfix_3.rdf | 0 .../test/xpcshell/data/test_install.rdf | 0 .../test/xpcshell/data/test_install.xml | 0 .../test/xpcshell/data/test_migrate.rdf | 0 .../test/xpcshell/data/test_migrate4.rdf | 0 .../test/xpcshell/data/test_no_update.json | 0 .../data/test_overrideblocklist/ancient.xml | 0 .../data/test_overrideblocklist/new.xml | 0 .../data/test_overrideblocklist/old.xml | 0 .../xpcshell/data/test_pluginBlocklistCtp.xml | 0 .../data/test_pluginBlocklistCtpUndo.xml | 0 .../xpcshell/data/test_proxy/bootstrap.js | 0 .../test/xpcshell/data/test_softblocked1.xml | 0 .../test/xpcshell/data/test_sourceURI.xml | 0 .../xpcshell/data/test_temporary/bootstrap.js | 0 .../test/xpcshell/data/test_update.json | 0 .../test/xpcshell/data/test_update.rdf | 0 .../test/xpcshell/data/test_update.xml | 0 .../test/xpcshell/data/test_update_multi.rdf | 0 .../test/xpcshell/data/test_updatecheck.json | 0 .../test/xpcshell/data/test_updatecheck.rdf | 0 .../data/test_updatecompatmode_ignore.rdf | 0 .../data/test_updatecompatmode_normal.rdf | 0 .../data/test_updatecompatmode_strict.rdf | 0 .../test/xpcshell/data/test_updateid.rdf | 0 .../test/xpcshell/data/unsigned.xpi | Bin .../test/xpcshell/data/webext-implicit-id.xpi | Bin .../test/xpcshell/head_addons.js | 0 .../test/xpcshell/head_unpack.js | 0 .../test/xpcshell/test_AddonRepository.js | 0 .../xpcshell/test_AddonRepository_cache.js | 0 .../test_AddonRepository_compatmode.js | 0 .../xpcshell/test_ChromeManifestParser.js | 0 .../test/xpcshell/test_DeferredSave.js | 0 .../xpcshell/test_LightweightThemeManager.js | 0 .../test/xpcshell/test_ProductAddonChecker.js | 0 .../test/xpcshell/test_XPIStates.js | 0 .../test/xpcshell/test_XPIcancel.js | 0 .../test/xpcshell/test_addon_path_service.js | 0 .../test/xpcshell/test_asyncBlocklistLoad.js | 0 .../test/xpcshell/test_backgroundupdate.js | 0 .../test/xpcshell/test_bad_json.js | 0 .../test/xpcshell/test_badschema.js | 0 .../test/xpcshell/test_blocklist_gfx.js | 0 .../test_blocklist_metadata_filters.js | 0 .../test/xpcshell/test_blocklist_prefs.js | 0 .../test/xpcshell/test_blocklist_regexp.js | 0 .../test/xpcshell/test_blocklistchange.js | 0 .../test/xpcshell/test_bootstrap.js | 0 .../test/xpcshell/test_bootstrap_const.js | 0 .../test/xpcshell/test_bootstrap_globals.js | 0 .../test/xpcshell/test_bootstrap_resource.js | 0 .../test/xpcshell/test_bug1180901.js | 0 .../test/xpcshell/test_bug1180901_2.js | 0 .../test/xpcshell/test_bug299716.js | 0 .../test/xpcshell/test_bug299716_2.js | 0 .../test/xpcshell/test_bug324121.js | 0 .../test/xpcshell/test_bug335238.js | 0 .../test/xpcshell/test_bug371495.js | 0 .../test/xpcshell/test_bug384052.js | 0 .../test/xpcshell/test_bug393285.js | 0 .../test/xpcshell/test_bug394300.js | 0 .../test/xpcshell/test_bug397778.js | 0 .../test/xpcshell/test_bug406118.js | 0 .../test/xpcshell/test_bug424262.js | 0 .../test/xpcshell/test_bug425657.js | 0 .../test/xpcshell/test_bug430120.js | 0 .../test/xpcshell/test_bug449027.js | 0 .../test/xpcshell/test_bug455906.js | 0 .../test/xpcshell/test_bug465190.js | 0 .../test/xpcshell/test_bug468528.js | 0 .../test/xpcshell/test_bug470377_1.js | 0 .../xpcshell/test_bug470377_1_strictcompat.js | 0 .../test/xpcshell/test_bug470377_2.js | 0 .../test/xpcshell/test_bug470377_3.js | 0 .../xpcshell/test_bug470377_3_strictcompat.js | 0 .../test/xpcshell/test_bug470377_4.js | 0 .../test/xpcshell/test_bug514327_1.js | 0 .../test/xpcshell/test_bug514327_2.js | 0 .../test/xpcshell/test_bug514327_3.js | 0 .../test/xpcshell/test_bug521905.js | 0 .../test/xpcshell/test_bug526598.js | 0 .../test/xpcshell/test_bug541420.js | 0 .../test/xpcshell/test_bug542391.js | 0 .../test/xpcshell/test_bug554133.js | 0 .../test/xpcshell/test_bug559800.js | 0 .../test/xpcshell/test_bug563256.js | 0 .../test/xpcshell/test_bug564030.js | 0 .../test/xpcshell/test_bug566626.js | 0 .../test/xpcshell/test_bug567184.js | 0 .../test/xpcshell/test_bug569138.js | 0 .../test/xpcshell/test_bug570173.js | 0 .../test/xpcshell/test_bug576735.js | 0 .../test/xpcshell/test_bug587088.js | 0 .../test/xpcshell/test_bug594058.js | 0 .../test/xpcshell/test_bug595081.js | 0 .../test/xpcshell/test_bug595573.js | 0 .../test/xpcshell/test_bug596607.js | 0 .../test/xpcshell/test_bug616841.js | 0 .../test/xpcshell/test_bug619730.js | 0 .../test/xpcshell/test_bug620837.js | 0 .../test/xpcshell/test_bug655254.js | 0 .../test/xpcshell/test_bug659772.js | 0 .../test/xpcshell/test_bug675371.js | 0 .../test/xpcshell/test_bug740612.js | 0 .../test/xpcshell/test_bug753900.js | 0 .../test/xpcshell/test_bug757663.js | 0 .../test/xpcshell/test_bug953156.js | 0 .../test/xpcshell/test_cache_certdb.js | 0 .../test/xpcshell/test_cacheflush.js | 0 .../test_checkCompatibility_themeOverride.js | 0 .../test/xpcshell/test_checkcompatibility.js | 0 .../test/xpcshell/test_childprocess.js | 0 .../test/xpcshell/test_compatoverrides.js | 0 .../test/xpcshell/test_corrupt.js | 0 .../xpcshell/test_corrupt_strictcompat.js | 0 .../test/xpcshell/test_corruptfile.js | 0 .../test/xpcshell/test_dataDirectory.js | 0 .../xpcshell/test_default_providers_pref.js | 0 .../test/xpcshell/test_delay_update.js | 0 .../test_delay_update_webextension.js | 0 .../test/xpcshell/test_dependencies.js | 0 .../test/xpcshell/test_dictionary.js | 0 .../test/xpcshell/test_disable.js | 0 .../test/xpcshell/test_distribution.js | 0 .../test/xpcshell/test_dss.js | 0 .../test/xpcshell/test_duplicateplugins.js | 0 .../test/xpcshell/test_e10s_restartless.js | 0 .../test/xpcshell/test_error.js | 0 .../test/xpcshell/test_experiment.js | 0 .../test/xpcshell/test_ext_management.js | 0 .../test/xpcshell/test_filepointer.js | 0 .../test/xpcshell/test_fuel.js | 0 .../test/xpcshell/test_general.js | 0 .../test/xpcshell/test_getresource.js | 0 .../test/xpcshell/test_gfxBlacklist_Device.js | 0 .../xpcshell/test_gfxBlacklist_DriverNew.js | 0 .../test_gfxBlacklist_Equal_DriverNew.js | 0 .../test_gfxBlacklist_Equal_DriverOld.js | 0 .../xpcshell/test_gfxBlacklist_Equal_OK.js | 0 .../test_gfxBlacklist_GTE_DriverOld.js | 0 .../test/xpcshell/test_gfxBlacklist_GTE_OK.js | 0 .../test_gfxBlacklist_No_Comparison.js | 0 .../test/xpcshell/test_gfxBlacklist_OK.js | 0 .../test/xpcshell/test_gfxBlacklist_OS.js | 0 .../test_gfxBlacklist_OSVersion_match.js | 0 ...cklist_OSVersion_mismatch_DriverVersion.js | 0 ...xBlacklist_OSVersion_mismatch_OSVersion.js | 0 .../test/xpcshell/test_gfxBlacklist_Vendor.js | 0 .../xpcshell/test_gfxBlacklist_Version.js | 0 .../test/xpcshell/test_gfxBlacklist_prefs.js | 0 .../test/xpcshell/test_gmpProvider.js | 0 .../test/xpcshell/test_hasbinarycomponents.js | 0 .../test/xpcshell/test_hotfix.js | 0 .../test/xpcshell/test_hotfix_cert.js | 0 .../test/xpcshell/test_install.js | 0 .../xpcshell/test_install_from_sources.js | 0 .../test/xpcshell/test_install_icons.js | 0 .../xpcshell/test_install_strictcompat.js | 0 .../test/xpcshell/test_isDebuggable.js | 0 .../test/xpcshell/test_isReady.js | 0 .../test/xpcshell/test_json_updatecheck.js | 0 .../test/xpcshell/test_langpack.js | 0 .../test/xpcshell/test_locale.js | 0 .../test/xpcshell/test_locked.js | 0 .../test/xpcshell/test_locked2.js | 0 .../test/xpcshell/test_locked_strictcompat.js | 0 .../test/xpcshell/test_manifest.js | 0 .../test/xpcshell/test_mapURIToAddonID.js | 0 .../test/xpcshell/test_metadata_update.js | 0 .../test/xpcshell/test_migrate1.js | 0 .../test/xpcshell/test_migrate2.js | 0 .../test/xpcshell/test_migrate3.js | 0 .../test/xpcshell/test_migrate4.js | 0 .../test/xpcshell/test_migrate5.js | 0 .../xpcshell/test_migrateAddonRepository.js | 0 .../test/xpcshell/test_migrate_max_version.js | 0 .../xpcshell/test_multiprocessCompatible.js | 0 .../test/xpcshell/test_no_addons.js | 0 .../test/xpcshell/test_nodisable_hidden.js | 0 .../test_onPropertyChanged_appDisabled.js | 0 .../test/xpcshell/test_overrideblocklist.js | 0 .../test/xpcshell/test_pass_symbol.js | 0 .../test/xpcshell/test_permissions.js | 0 .../test/xpcshell/test_permissions_prefs.js | 0 .../test/xpcshell/test_pluginBlocklistCtp.js | 0 .../test/xpcshell/test_pluginInfoURL.js | 0 .../test/xpcshell/test_pluginchange.js | 0 .../test/xpcshell/test_plugins.js | 0 .../test/xpcshell/test_pref_properties.js | 0 .../test/xpcshell/test_provider_markSafe.js | 0 .../test/xpcshell/test_provider_shutdown.js | 0 .../test_provider_unsafe_access_shutdown.js | 0 .../test_provider_unsafe_access_startup.js | 0 .../test/xpcshell/test_proxies.js | 0 .../test/xpcshell/test_proxy.js | 0 .../test/xpcshell/test_registry.js | 0 .../test/xpcshell/test_reload.js | 0 .../test/xpcshell/test_safemode.js | 0 .../test/xpcshell/test_schema_change.js | 0 .../test/xpcshell/test_seen.js | 0 .../test/xpcshell/test_seen_newprofile.js | 0 .../test/xpcshell/test_shutdown.js | 0 .../test/xpcshell/test_signed_inject.js | 0 .../test/xpcshell/test_signed_install.js | 0 .../test/xpcshell/test_signed_long.js | 0 .../test/xpcshell/test_signed_migrate.js | 0 .../test/xpcshell/test_signed_multi.js | 0 .../test/xpcshell/test_signed_updatepref.js | 0 .../test/xpcshell/test_signed_verify.js | 0 .../test/xpcshell/test_softblocked.js | 0 .../test/xpcshell/test_sourceURI.js | 0 .../test/xpcshell/test_startup.js | 0 .../test/xpcshell/test_strictcompatibility.js | 0 .../test/xpcshell/test_switch_os.js | 0 .../test/xpcshell/test_syncGUID.js | 0 .../test/xpcshell/test_system_delay_update.js | 0 .../test/xpcshell/test_system_reset.js | 0 .../test/xpcshell/test_system_update.js | 0 .../test/xpcshell/test_targetPlatforms.js | 0 .../test/xpcshell/test_temporary.js | 0 .../test/xpcshell/test_theme.js | 0 .../test/xpcshell/test_types.js | 0 .../test/xpcshell/test_undothemeuninstall.js | 0 .../test/xpcshell/test_undouninstall.js | 0 .../test/xpcshell/test_uninstall.js | 0 .../test/xpcshell/test_update.js | 0 .../test/xpcshell/test_updateCancel.js | 0 .../test/xpcshell/test_update_compatmode.js | 0 .../test/xpcshell/test_update_ignorecompat.js | 0 .../test/xpcshell/test_update_strictcompat.js | 0 .../xpcshell/test_update_webextensions.js | 0 .../test/xpcshell/test_updatecheck.js | 0 .../test/xpcshell/test_updateid.js | 0 .../test/xpcshell/test_upgrade.js | 0 .../xpcshell/test_upgrade_strictcompat.js | 0 .../test/xpcshell/test_webextension.js | 0 .../xpcshell/test_webextension_embedded.js | 0 .../test/xpcshell/test_webextension_icons.js | 0 .../xpcshell/test_webextension_install.js | 0 .../test/xpcshell/test_webextension_paths.js | 0 .../test/xpcshell/xpcshell-shared.ini | 0 .../test/xpcshell/xpcshell-unpack.ini | 0 .../test/xpcshell/xpcshell.ini | 0 .../test/xpinstall/.eslintrc.js | 0 .../test/xpinstall/amosigned.xpi | Bin .../test/xpinstall/amosigned2.xpi | Bin .../test/xpinstall/authRedirect.sjs | 0 .../test/xpinstall/browser.ini | 0 .../xpinstall/browser_amosigned_trigger.js | 0 .../browser_amosigned_trigger_iframe.js | 0 .../test/xpinstall/browser_amosigned_url.js | 0 .../test/xpinstall/browser_auth.js | 0 .../test/xpinstall/browser_auth2.js | 0 .../test/xpinstall/browser_auth3.js | 0 .../test/xpinstall/browser_auth4.js | 0 .../test/xpinstall/browser_badargs.js | 0 .../test/xpinstall/browser_badargs2.js | 0 .../test/xpinstall/browser_badhash.js | 0 .../test/xpinstall/browser_badhashtype.js | 0 .../test/xpinstall/browser_bug540558.js | 0 .../test/xpinstall/browser_bug611242.js | 0 .../test/xpinstall/browser_bug638292.js | 0 .../test/xpinstall/browser_bug645699.js | 0 .../test/xpinstall/browser_bug672485.js | 0 .../test/xpinstall/browser_cancel.js | 0 .../xpinstall/browser_concurrent_installs.js | 0 .../test/xpinstall/browser_cookies.js | 0 .../test/xpinstall/browser_cookies2.js | 0 .../test/xpinstall/browser_cookies3.js | 0 .../test/xpinstall/browser_cookies4.js | 0 .../test/xpinstall/browser_corrupt.js | 0 .../test/xpinstall/browser_datauri.js | 0 .../test/xpinstall/browser_empty.js | 0 .../test/xpinstall/browser_enabled.js | 0 .../test/xpinstall/browser_enabled2.js | 0 .../test/xpinstall/browser_enabled3.js | 0 .../test/xpinstall/browser_hash.js | 0 .../test/xpinstall/browser_hash2.js | 0 .../test/xpinstall/browser_httphash.js | 0 .../test/xpinstall/browser_httphash2.js | 0 .../test/xpinstall/browser_httphash3.js | 0 .../test/xpinstall/browser_httphash4.js | 0 .../test/xpinstall/browser_httphash5.js | 0 .../test/xpinstall/browser_httphash6.js | 0 .../test/xpinstall/browser_installchrome.js | 0 .../test/xpinstall/browser_localfile.js | 0 .../test/xpinstall/browser_localfile2.js | 0 .../test/xpinstall/browser_localfile3.js | 0 .../test/xpinstall/browser_localfile4.js | 0 .../test/xpinstall/browser_multipackage.js | 0 .../test/xpinstall/browser_navigateaway.js | 0 .../test/xpinstall/browser_navigateaway2.js | 0 .../test/xpinstall/browser_navigateaway3.js | 0 .../test/xpinstall/browser_navigateaway4.js | 0 .../test/xpinstall/browser_offline.js | 0 .../test/xpinstall/browser_relative.js | 0 .../xpinstall/browser_signed_multipackage.js | 0 .../test/xpinstall/browser_signed_multiple.js | 0 .../test/xpinstall/browser_signed_naming.js | 0 .../test/xpinstall/browser_signed_tampered.js | 0 .../test/xpinstall/browser_signed_trigger.js | 0 .../xpinstall/browser_signed_untrusted.js | 0 .../test/xpinstall/browser_signed_url.js | 0 .../test/xpinstall/browser_softwareupdate.js | 0 .../test/xpinstall/browser_switchtab.js | 0 .../xpinstall/browser_trigger_redirect.js | 0 .../xpinstall/browser_unsigned_trigger.js | 0 .../browser_unsigned_trigger_iframe.js | 0 .../browser_unsigned_trigger_xorigin.js | 0 .../test/xpinstall/browser_unsigned_url.js | 0 .../test/xpinstall/browser_whitelist.js | 0 .../test/xpinstall/browser_whitelist2.js | 0 .../test/xpinstall/browser_whitelist3.js | 0 .../test/xpinstall/browser_whitelist4.js | 0 .../test/xpinstall/browser_whitelist5.js | 0 .../test/xpinstall/browser_whitelist6.js | 0 .../test/xpinstall/browser_whitelist7.js | 0 .../test/xpinstall/bug540558.html | 0 .../test/xpinstall/bug638292.html | 0 .../test/xpinstall/bug645699.html | 0 .../test/xpinstall/concurrent_installs.html | 0 .../test/xpinstall/cookieRedirect.sjs | 0 .../test/xpinstall/corrupt.xpi | 0 .../test/xpinstall/empty.xpi | Bin .../test/xpinstall/enabled.html | 0 .../test/xpinstall/hashRedirect.sjs | 0 .../test/xpinstall/head.js | 0 .../test/xpinstall/incompatible.xpi | Bin .../test/xpinstall/installchrome.html | 0 .../test/xpinstall/installtrigger.html | 0 .../test/xpinstall/installtrigger_frame.html | 0 .../test/xpinstall/multipackage.xpi | Bin .../test/xpinstall/navigate.html | 0 .../test/xpinstall/redirect.sjs | 0 .../test/xpinstall/restartless-unsigned.xpi | Bin .../test/xpinstall/restartless.xpi | Bin .../test/xpinstall/signed-multipackage.xpi | Bin .../test/xpinstall/signed-no-cn.xpi | Bin .../test/xpinstall/signed-no-o.xpi | Bin .../test/xpinstall/signed-tampered.xpi | Bin .../test/xpinstall/signed-untrusted.xpi | Bin .../test/xpinstall/signed.xpi | Bin .../test/xpinstall/signed2.xpi | Bin .../test/xpinstall/slowinstall.sjs | 0 .../test/xpinstall/startsoftwareupdate.html | 0 .../test/xpinstall/theme.xpi | Bin .../test/xpinstall/triggerredirect.html | 0 .../test/xpinstall/unsigned.xpi | Bin toolkit/themes/linux/mozapps/jar.mn | 32 +++++---- .../category-available.png | Bin .../category-discover.png | Bin .../category-plugins.png | Bin .../category-recent.png | Bin .../category-search.png | Bin .../category-service.png | Bin .../dictionaryGeneric-16.png | Bin .../dictionaryGeneric.png | Bin .../extensionGeneric-16.png | Bin .../extensions.css | 2 +- .../{extensions => webextensions}/heart.png | Bin .../localeGeneric.png | Bin .../mozapps/webextensions}/newaddon.css | 2 +- .../themeGeneric-16.png | Bin .../themeGeneric.png | Bin toolkit/themes/osx/mozapps/jar.mn | 64 ++++++++++-------- .../{extensions => webextensions}/about.css | 0 .../blocklist.css | 0 .../{extensions => webextensions}/cancel.png | Bin .../category-available.png | Bin .../category-dictionaries.png | Bin .../category-discover.png | Bin .../category-experiments.png | Bin .../category-plugins.png | Bin .../category-recent.png | Bin .../category-search.png | Bin .../category-service.png | Bin .../dictionaryGeneric-16.png | Bin .../dictionaryGeneric.png | Bin .../discover-logo.png | Bin .../{extensions => webextensions}/eula.css | 0 .../experimentGeneric.png | Bin .../extensionGeneric-16.png | Bin .../extensions.css | 2 +- .../{extensions => webextensions}/heart.png | Bin .../localeGeneric.png | Bin .../mozapps/webextensions}/newaddon.css | 2 +- .../rating-not-won.png | Bin .../rating-won.png | Bin .../{extensions => webextensions}/search.png | Bin .../themeGeneric-16.png | Bin .../themeGeneric.png | Bin .../toolbarbutton-dropmarker.png | Bin .../{extensions => webextensions}/update.css | 0 .../xpinstallConfirm.css | 0 toolkit/themes/shared/mozapps.inc.mn | 16 +++-- toolkit/themes/shared/non-mac.jar.inc.mn | 27 +++++--- .../alerticon-error.svg | 0 .../alerticon-info-negative.svg | 0 .../alerticon-info-positive.svg | 0 .../alerticon-warning.svg | 0 .../extensionGeneric.svg | 0 .../extensions.inc.css | 0 .../navigation.png | Bin .../newaddon.inc.css | 0 .../utilities.svg | 0 toolkit/themes/windows/mozapps/jar.mn | 52 +++++++------- .../{extensions => webextensions}/about.css | 0 .../blocklist.css | 0 .../{extensions => webextensions}/cancel.png | Bin .../category-available-XP.png | Bin .../category-available.png | Bin .../category-discover-XP.png | Bin .../category-discover.png | Bin .../category-plugins-XP.png | Bin .../category-plugins.png | Bin .../category-recent-XP.png | Bin .../category-recent.png | Bin .../category-search.png | Bin .../category-service.png | Bin .../dictionaryGeneric-16.png | Bin .../dictionaryGeneric.png | Bin .../discover-logo.png | Bin .../{extensions => webextensions}/eula.css | 0 .../experimentGeneric.png | Bin .../extensionGeneric-16-XP.png | Bin .../extensionGeneric-16.png | Bin .../extensions.css | 2 +- .../{extensions => webextensions}/heart.png | Bin .../localeGeneric-XP.png | Bin .../localeGeneric.png | Bin .../mozapps/webextensions}/newaddon.css | 2 +- .../rating-not-won.png | Bin .../rating-won.png | Bin .../themeGeneric-16-XP.png | Bin .../themeGeneric-16.png | Bin .../themeGeneric-XP.png | Bin .../themeGeneric.png | Bin .../{extensions => webextensions}/update.css | 0 .../xpinstallConfirm.css | 0 1100 files changed, 133 insertions(+), 106 deletions(-) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/about.dtd (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/blocklist.dtd (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/extensions.dtd (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/extensions.properties (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/newaddon.dtd (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/newaddon.properties (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/update.dtd (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/update.properties (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/xpinstallConfirm.dtd (100%) rename toolkit/locales/en-US/chrome/mozapps/{extensions => webextensions}/xpinstallConfirm.properties (100%) rename toolkit/mozapps/{extensions => webextensions}/.eslintrc.js (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonContentPolicy.cpp (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonContentPolicy.h (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonManager.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonManagerWebAPI.cpp (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonManagerWebAPI.h (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonPathService.cpp (100%) rename toolkit/mozapps/{extensions => webextensions}/AddonPathService.h (100%) rename toolkit/mozapps/{extensions => webextensions}/ChromeManifestParser.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/DeferredSave.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/LightweightThemeManager.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/addonManager.js (100%) rename toolkit/mozapps/{extensions => webextensions}/amContentHandler.js (100%) rename toolkit/mozapps/{extensions => webextensions}/amIAddonManager.idl (100%) rename toolkit/mozapps/{extensions => webextensions}/amIAddonPathService.idl (100%) rename toolkit/mozapps/{extensions => webextensions}/amIWebInstallListener.idl (100%) rename toolkit/mozapps/{extensions => webextensions}/amIWebInstaller.idl (100%) rename toolkit/mozapps/{extensions => webextensions}/amInstallTrigger.js (100%) rename toolkit/mozapps/{extensions => webextensions}/amWebAPI.js (100%) rename toolkit/mozapps/{extensions => webextensions}/amWebInstallListener.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/OpenH264-license.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/content/about.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/about.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/blocklist.css (100%) rename toolkit/mozapps/{extensions => webextensions}/content/blocklist.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/blocklist.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/content/blocklist.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/eula.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/eula.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/extensions.css (100%) rename toolkit/mozapps/{extensions => webextensions}/content/extensions.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/extensions.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/content/extensions.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/gmpPrefs.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/list.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/list.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/newaddon.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/newaddon.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/pluginPrefs.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/setting.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/content/update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/update.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/updateinfo.xsl (100%) rename toolkit/mozapps/{extensions => webextensions}/content/xpinstallConfirm.css (100%) rename toolkit/mozapps/{extensions => webextensions}/content/xpinstallConfirm.js (100%) rename toolkit/mozapps/{extensions => webextensions}/content/xpinstallConfirm.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/content/xpinstallItem.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/docs/SystemAddons.rst (100%) rename toolkit/mozapps/{extensions => webextensions}/docs/index.rst (100%) rename toolkit/mozapps/{extensions => webextensions}/extensions.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/APIExtensionBootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/AddonConstants.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/AddonLogging.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/AddonRepository.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/AddonRepository_SQLiteMigrator.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/AddonTestUtils.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/AddonUpdateChecker.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/Content.js (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/E10SAddonsRollout.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/GMPProvider.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/LightweightThemeImageOptimizer.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/PluginProvider.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/ProductAddonChecker.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/SpellCheckDictionaryBootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/WebExtensionBootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/XPIProvider.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/XPIProviderUtils.js (100%) rename toolkit/mozapps/{extensions => webextensions}/internal/moz.build (100%) rename toolkit/mozapps/{extensions => webextensions}/jar.mn (100%) rename toolkit/mozapps/{extensions => webextensions}/moz.build (100%) rename toolkit/mozapps/{extensions => webextensions}/nsBlocklistService.js (100%) rename toolkit/mozapps/{extensions => webextensions}/nsBlocklistServiceContent.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/AddonManagerTesting.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/test/Makefile.in (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_hard1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_hard1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_hard1_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_regexp1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_regexp1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_regexp1_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft1_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft2_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft2_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft2_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft3_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft3_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft3_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft4_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft4_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft4_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft5_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft5_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/blocklist_soft5_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/bootstrap_globals/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/bootstrap_globals/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/min1max1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/min1max2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/min1max3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/min1max3b/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/override1x2-1x3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_AddonRepository_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_AddonRepository_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_AddonRepository_3/icon.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_AddonRepository_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_AddonRepository_3/preview.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_1/version.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_2/version.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_3/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_3/version.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap1_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap2_1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap2_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap_const/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bootstrap_const/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_a_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_a_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_b_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_b_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_c_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_c_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_d_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_d_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_e_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_e_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_f_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_f_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_g_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug299716_g_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_7/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_8/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug324121_9/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug335238_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug335238_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug335238_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug335238_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug371495/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug394300_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug394300_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug397778/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug425657/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug470377_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug470377_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug470377_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug470377_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug470377_5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug521905/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug567173/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug567184/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug567184/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug587088_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug587088_1/testfile (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug587088_1/testfile1 (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug587088_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug587088_2/testfile (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug587088_2/testfile2 (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug594058/directory/file1 (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug594058/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug595573/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug655254/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug655254_2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug655254_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug659772/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug675371/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug675371/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug675371/test.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug740612_1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug740612_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug740612_2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug740612_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_bug757663/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_cacheflush1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_cacheflush2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_1/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_2/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_3/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_3/inner.jar (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_4/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_4/components/components.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_4/components/other/something.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_5/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_6/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_chromemanifest_6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_data_directory/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_db_sanity_1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_db_sanity_1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_complete_v2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_complete_v2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_complete_webextension_v2/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_defer_v2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_defer_v2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_defer_webextension_v2/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_ignore_v2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_ignore_v2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_delay_update_ignore_webextension_v2/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary/dictionaries/ab-CD.dic (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary_2/dictionaries/ab-CD.dic (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_dictionary_5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_distribution1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_experiment1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_experiment1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_filepointer/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_getresource/icon.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_getresource/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_getresource/subdir/subfile.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_hotfix_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_hotfix_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install1/icon.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install1/icon64.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install2_1/icon.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install2_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install2_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/addon4.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/addon5.jar (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/addon6.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/addon7.jar (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/badaddon.jar (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/badaddon.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/icon.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install5/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install7/addon1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install7/addon2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install7/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_install8/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_jetpack/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_jetpack/harness-options.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_jetpack/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_langpack/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_langpack/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_locale/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_locked2_5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_locked2_6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate4_6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate4_7/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate7/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate8/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate8/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_migrate9/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_symbol/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_symbol/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_theme/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_theme/preview.png (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_undoincompatible/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_undoincompatible/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_undouninstall1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_undouninstall1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update12/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update8/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update_multi1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update_multi1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update_multi2/addon.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_update_multi2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_updateid1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_updateid1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_updateid2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/test_updateid2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/upgradeable1x2-3_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/upgradeable1x2-3_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_1/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_1/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_2/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_3/_locales/en/messages.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_3/_locales/fr/messages.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/addons/webextension_3/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/.eslintrc.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addon_about.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addon_prefs.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_10.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_10/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_3.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_3/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_4.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_4/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_5.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_5/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_6.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_6/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_7.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_7/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_8_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_8_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_9_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug557956_9_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug567127_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug567127_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug567127_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug567127_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug596336_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug596336_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug596336_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_bug596336_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_dragdrop1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_dragdrop1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_dragdrop2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_dragdrop2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_experiment1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_experiment1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1/options.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1/settings.dtd (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom/binding.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom/options.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_custom/string.dtd (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_info.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_info/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_info/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_inlinesettings1_info/options.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_install1_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_install1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_install1_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_install1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_installssl.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_installssl/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_searching.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_searching/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_searching/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_1/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_1/frame-script.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_2/chrome.manifest (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_2/frame-script.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_update1_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_webapi_install.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_webapi_install/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/browser_webapi_install/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/options_signed.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/options_signed/manifest.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/addons/options_signed/options.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/blockNoPlugins.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/blockPluginHard.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser-common.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser-window.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_CTP_plugins.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_about.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_addonrepository_performance.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug523784.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug557943.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug557956.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug557956.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug557956.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug557956_8_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug557956_9_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug562797.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug562854.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug562890.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug562899.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug562992.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug567127.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug567137.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug570760.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug572561.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug573062.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug577990.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug580298.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug581076.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug586574.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug587970.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug590347.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug591465.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug591465.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug591663.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug593535.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug593535.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug596336.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug608316.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug610764.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug616841.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug618502.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug679604.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_bug714593.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_cancelCompatCheck.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_checkAddonCompatibility.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_details.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_discovery.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_discovery_install.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_dragdrop.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_eula.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_eula.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_experiments.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_globalwarnings.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_gmpProvider.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_hotfix.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_inlinesettings.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_inlinesettings_browser.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_inlinesettings_custom.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_inlinesettings_info.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_install.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_install.rdf^headers^ (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_install.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_install1_3.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_installssl.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_list.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_manualupdates.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_metadataTimeout.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_newaddon.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_openDialog.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_plugin_enabled_state_locked.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_pluginprefs.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_purchase.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_purchase.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_recentupdates.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_searching.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_searching.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_searching_empty.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_sorting.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_sorting_plugins.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_system_addons_are_e10s.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_tabsettings.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_task_next_test.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_types.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_uninstalling.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_updateid.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_updatessl.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_updatessl.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_updatessl.rdf^headers^ (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webapi.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webapi_access.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webapi_addon_listener.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webapi_enable.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webapi_install.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webapi_uninstall.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/browser_webext_options.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/cancelCompatCheck.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/discovery.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/discovery_frame.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/discovery_install.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/head.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/more_options.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/moz.build (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/options.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/plugin_test.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/redirect.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/releaseNotes.xhtml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/signed_hotfix.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/signed_hotfix.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/unsigned_hotfix.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/unsigned_hotfix.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/webapi_addon_listener.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/webapi_checkavailable.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/webapi_checkchromeframe.xul (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/webapi_checkframed.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/browser/webapi_checknavigatedwindow.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/.eslintrc.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/file_bug687194.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/file_empty.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/mochitest.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/test_bug609794.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/test_bug687194.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/mochitest/test_bug887098.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/moz.build (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/.eslintrc.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/BootstrapMonitor.jsm (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/addon_change.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/addon_update1.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/addon_update2.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/addon_update3.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/app_update.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/blocklist_update1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/blocklist_update2.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/blocklistchange/manual_update.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/bug455906_block.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/bug455906_empty.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/bug455906_start.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/bug455906_warn.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/corrupt.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/corruptfile.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/empty.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/from_sources/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/from_sources/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/pluginInfoURL_block.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/bad.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/bad.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/bad2.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/empty.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/good.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/missing.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/productaddons/unsigned.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/bootstrap_1/test.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/bootstrap_2/test.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/hotfix_badid.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/hotfix_broken.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/hotfix_good.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/long_63_hash.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/long_63_plain.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/long_64_hash.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/long_64_plain.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/long_65_hash.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/multi_badid.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/multi_broken.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/multi_signed.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/multi_unsigned.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system1_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system1_1_badcert.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system1_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system2_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system2_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system2_3.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system3_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system3_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system3_3.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system4_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system5_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system6_1_unpack.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_complete.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_complete_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_defer.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_defer_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_defer_also.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_ignore.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/system_addons/system_failed_update.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_cache.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_empty.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_failed.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_backgroundupdate.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_blocklist_metadata_filters_1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_blocklist_prefs_1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_blocklist_regexp_1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug299716.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug299716_2.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug324121.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug393285.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug394300.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug424262.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug449027_app.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug449027_toolkit.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug468528.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/install_1.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/install_2.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/install_3.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/install_4.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/install_5.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/update_1.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/update_2.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/update_3.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/update_4.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug470377/update_5.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug514327_1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug514327_2.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug514327_3_empty.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug514327_3_outdated_1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug514327_3_outdated_2.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug526598_1.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug526598_2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug541420.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug542391.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug554133.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug619730.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_bug655254.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_compatoverrides.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_corrupt.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_update_complete/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_update_defer/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_update_ignore/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_updates_complete.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_updates_complete.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_updates_defer.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_updates_defer.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_updates_ignore.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_delay_updates_ignore.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_dictionary.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_distribution2_2/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_distribution2_2/install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_gfxBlacklist.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_gfxBlacklist2.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_gfxBlacklist_AllOS.xml (100%) mode change 100755 => 100644 rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_hotfix_1.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_hotfix_2.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_hotfix_3.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_install.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_install.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_migrate.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_migrate4.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_no_update.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_overrideblocklist/ancient.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_overrideblocklist/new.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_overrideblocklist/old.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_pluginBlocklistCtp.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_proxy/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_softblocked1.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_sourceURI.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_temporary/bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_update.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_update.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_update.xml (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_update_multi.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_updatecheck.json (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_updatecheck.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_updatecompatmode_ignore.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_updatecompatmode_normal.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_updatecompatmode_strict.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/test_updateid.rdf (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/unsigned.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/data/webext-implicit-id.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/head_addons.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/head_unpack.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_AddonRepository.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_AddonRepository_cache.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_AddonRepository_compatmode.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_ChromeManifestParser.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_DeferredSave.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_LightweightThemeManager.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_ProductAddonChecker.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_XPIStates.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_XPIcancel.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_addon_path_service.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_asyncBlocklistLoad.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_backgroundupdate.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bad_json.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_badschema.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_blocklist_gfx.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_blocklist_metadata_filters.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_blocklist_prefs.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_blocklist_regexp.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_blocklistchange.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bootstrap.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bootstrap_const.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bootstrap_globals.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bootstrap_resource.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug1180901.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug1180901_2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug299716.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug299716_2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug324121.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug335238.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug371495.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug384052.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug393285.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug394300.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug397778.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug406118.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug424262.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug425657.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug430120.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug449027.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug455906.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug465190.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug468528.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug470377_1.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug470377_1_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug470377_2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug470377_3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug470377_3_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug470377_4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug514327_1.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug514327_2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug514327_3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug521905.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug526598.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug541420.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug542391.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug554133.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug559800.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug563256.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug564030.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug566626.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug567184.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug569138.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug570173.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug576735.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug587088.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug594058.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug595081.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug595573.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug596607.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug616841.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug619730.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug620837.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug655254.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug659772.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug675371.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug740612.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug753900.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug757663.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_bug953156.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_cache_certdb.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_cacheflush.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_checkCompatibility_themeOverride.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_checkcompatibility.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_childprocess.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_compatoverrides.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_corrupt.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_corrupt_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_corruptfile.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_dataDirectory.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_default_providers_pref.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_delay_update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_delay_update_webextension.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_dependencies.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_dictionary.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_disable.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_distribution.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_dss.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_duplicateplugins.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_e10s_restartless.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_error.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_experiment.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_ext_management.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_filepointer.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_fuel.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_general.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_getresource.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_Device.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_DriverNew.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_Equal_OK.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_GTE_OK.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_No_Comparison.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_OK.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_OS.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_OSVersion_match.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_Vendor.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_Version.js (100%) mode change 100755 => 100644 rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gfxBlacklist_prefs.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_gmpProvider.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_hasbinarycomponents.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_hotfix.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_hotfix_cert.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_install.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_install_from_sources.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_install_icons.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_install_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_isDebuggable.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_isReady.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_json_updatecheck.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_langpack.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_locale.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_locked.js (100%) mode change 100755 => 100644 rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_locked2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_locked_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_manifest.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_mapURIToAddonID.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_metadata_update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrate1.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrate2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrate3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrate4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrate5.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrateAddonRepository.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_migrate_max_version.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_multiprocessCompatible.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_no_addons.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_nodisable_hidden.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_onPropertyChanged_appDisabled.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_overrideblocklist.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_pass_symbol.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_permissions.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_permissions_prefs.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_pluginBlocklistCtp.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_pluginInfoURL.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_pluginchange.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_plugins.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_pref_properties.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_provider_markSafe.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_provider_shutdown.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_provider_unsafe_access_shutdown.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_provider_unsafe_access_startup.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_proxies.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_proxy.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_registry.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_reload.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_safemode.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_schema_change.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_seen.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_seen_newprofile.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_shutdown.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_inject.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_install.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_long.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_migrate.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_multi.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_updatepref.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_signed_verify.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_softblocked.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_sourceURI.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_startup.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_strictcompatibility.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_switch_os.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_syncGUID.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_system_delay_update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_system_reset.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_system_update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_targetPlatforms.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_temporary.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_theme.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_types.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_undothemeuninstall.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_undouninstall.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_uninstall.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_update.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_updateCancel.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_update_compatmode.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_update_ignorecompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_update_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_update_webextensions.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_updatecheck.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_updateid.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_upgrade.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_upgrade_strictcompat.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_webextension.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_webextension_embedded.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_webextension_icons.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_webextension_install.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/test_webextension_paths.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/xpcshell-shared.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/xpcshell-unpack.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpcshell/xpcshell.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/.eslintrc.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/amosigned.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/amosigned2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/authRedirect.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser.ini (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_amosigned_trigger.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_amosigned_trigger_iframe.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_amosigned_url.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_auth.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_auth2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_auth3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_auth4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_badargs.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_badargs2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_badhash.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_badhashtype.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_bug540558.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_bug611242.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_bug638292.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_bug645699.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_bug672485.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_cancel.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_concurrent_installs.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_cookies.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_cookies2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_cookies3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_cookies4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_corrupt.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_datauri.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_empty.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_enabled.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_enabled2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_enabled3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_hash.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_hash2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_httphash.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_httphash2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_httphash3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_httphash4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_httphash5.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_httphash6.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_installchrome.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_localfile.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_localfile2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_localfile3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_localfile4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_multipackage.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_navigateaway.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_navigateaway2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_navigateaway3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_navigateaway4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_offline.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_relative.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_multipackage.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_multiple.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_naming.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_tampered.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_trigger.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_untrusted.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_signed_url.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_softwareupdate.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_switchtab.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_trigger_redirect.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_unsigned_trigger.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_unsigned_trigger_iframe.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_unsigned_trigger_xorigin.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_unsigned_url.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist2.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist3.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist4.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist5.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist6.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/browser_whitelist7.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/bug540558.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/bug638292.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/bug645699.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/concurrent_installs.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/cookieRedirect.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/corrupt.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/empty.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/enabled.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/hashRedirect.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/head.js (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/incompatible.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/installchrome.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/installtrigger.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/installtrigger_frame.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/multipackage.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/navigate.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/redirect.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/restartless-unsigned.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/restartless.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed-multipackage.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed-no-cn.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed-no-o.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed-tampered.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed-untrusted.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/signed2.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/slowinstall.sjs (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/startsoftwareupdate.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/theme.xpi (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/triggerredirect.html (100%) rename toolkit/mozapps/{extensions => webextensions}/test/xpinstall/unsigned.xpi (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/category-available.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/category-discover.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/category-plugins.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/category-recent.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/category-search.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/category-service.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/dictionaryGeneric-16.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/dictionaryGeneric.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/extensionGeneric-16.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/extensions.css (95%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/heart.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/localeGeneric.png (100%) rename toolkit/themes/{windows/mozapps/extensions => linux/mozapps/webextensions}/newaddon.css (78%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/themeGeneric-16.png (100%) rename toolkit/themes/linux/mozapps/{extensions => webextensions}/themeGeneric.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/about.css (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/blocklist.css (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/cancel.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-available.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-dictionaries.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-discover.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-experiments.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-plugins.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-recent.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-search.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/category-service.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/dictionaryGeneric-16.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/dictionaryGeneric.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/discover-logo.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/eula.css (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/experimentGeneric.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/extensionGeneric-16.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/extensions.css (95%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/heart.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/localeGeneric.png (100%) rename toolkit/themes/{linux/mozapps/extensions => osx/mozapps/webextensions}/newaddon.css (78%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/rating-not-won.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/rating-won.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/search.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/themeGeneric-16.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/themeGeneric.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/toolbarbutton-dropmarker.png (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/update.css (100%) rename toolkit/themes/osx/mozapps/{extensions => webextensions}/xpinstallConfirm.css (100%) rename toolkit/themes/shared/{extensions => webextensions}/alerticon-error.svg (100%) rename toolkit/themes/shared/{extensions => webextensions}/alerticon-info-negative.svg (100%) rename toolkit/themes/shared/{extensions => webextensions}/alerticon-info-positive.svg (100%) rename toolkit/themes/shared/{extensions => webextensions}/alerticon-warning.svg (100%) rename toolkit/themes/shared/{extensions => webextensions}/extensionGeneric.svg (100%) rename toolkit/themes/shared/{extensions => webextensions}/extensions.inc.css (100%) rename toolkit/themes/shared/{extensions => webextensions}/navigation.png (100%) rename toolkit/themes/shared/{extensions => webextensions}/newaddon.inc.css (100%) rename toolkit/themes/shared/{extensions => webextensions}/utilities.svg (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/about.css (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/blocklist.css (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/cancel.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-available-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-available.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-discover-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-discover.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-plugins-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-plugins.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-recent-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-recent.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-search.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/category-service.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/dictionaryGeneric-16.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/dictionaryGeneric.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/discover-logo.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/eula.css (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/experimentGeneric.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/extensionGeneric-16-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/extensionGeneric-16.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/extensions.css (95%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/heart.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/localeGeneric-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/localeGeneric.png (100%) rename toolkit/themes/{osx/mozapps/extensions => windows/mozapps/webextensions}/newaddon.css (78%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/rating-not-won.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/rating-won.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/themeGeneric-16-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/themeGeneric-16.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/themeGeneric-XP.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/themeGeneric.png (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/update.css (100%) rename toolkit/themes/windows/mozapps/{extensions => webextensions}/xpinstallConfirm.css (100%) diff --git a/browser/experiments/test/xpcshell/xpcshell.ini b/browser/experiments/test/xpcshell/xpcshell.ini index 5ea30976c..5921c9c47 100644 --- a/browser/experiments/test/xpcshell/xpcshell.ini +++ b/browser/experiments/test/xpcshell/xpcshell.ini @@ -10,7 +10,7 @@ support-files = experiment-1a.xpi experiment-2.xpi experiment-racybranch.xpi - !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js + !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js generated-files = experiment-1.xpi experiment-1a.xpi diff --git a/services/sync/tests/unit/xpcshell.ini b/services/sync/tests/unit/xpcshell.ini index e5b32e7b1..5a90652b8 100644 --- a/services/sync/tests/unit/xpcshell.ini +++ b/services/sync/tests/unit/xpcshell.ini @@ -13,8 +13,8 @@ support-files = sync_ping_schema.json systemaddon-search.xml !/services/common/tests/unit/head_helpers.js - !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js - !/toolkit/components/extensions/test/xpcshell/head_sync.js + !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js + !/toolkit/components/webextensions/test/xpcshell/head_sync.js # The manifest is roughly ordered from low-level to high-level. When making # systemic sweeping changes, this makes it easier to identify errors closer to diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini index 74067580a..fe58d362e 100644 --- a/toolkit/components/telemetry/tests/unit/xpcshell.ini +++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini @@ -15,7 +15,7 @@ support-files = system.xpi restartless.xpi theme.xpi - !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js + !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js generated-files = dictionary.xpi experiment.xpi diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/about.dtd rename to toolkit/locales/en-US/chrome/mozapps/webextensions/about.dtd diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/blocklist.dtd rename to toolkit/locales/en-US/chrome/mozapps/webextensions/blocklist.dtd diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd rename to toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.dtd diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties rename to toolkit/locales/en-US/chrome/mozapps/webextensions/extensions.properties diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.dtd rename to toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.dtd diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/newaddon.properties rename to toolkit/locales/en-US/chrome/mozapps/webextensions/newaddon.properties diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/update.dtd rename to toolkit/locales/en-US/chrome/mozapps/webextensions/update.dtd diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/update.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/update.properties rename to toolkit/locales/en-US/chrome/mozapps/webextensions/update.properties diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.dtd rename to toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.dtd diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties b/toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties similarity index 100% rename from toolkit/locales/en-US/chrome/mozapps/extensions/xpinstallConfirm.properties rename to toolkit/locales/en-US/chrome/mozapps/webextensions/xpinstallConfirm.properties diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index c28cf6f49..e42f0de00 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -105,15 +105,17 @@ locale/@AB_CD@/mozapps/downloads/settingsChange.dtd (%chrome/mozapps/downloads/settingsChange.dtd) locale/@AB_CD@/mozapps/downloads/downloads.dtd (%chrome/mozapps/downloads/downloads.dtd) locale/@AB_CD@/mozapps/downloads/downloads.properties (%chrome/mozapps/downloads/downloads.properties) - locale/@AB_CD@/mozapps/extensions/extensions.dtd (%chrome/mozapps/extensions/extensions.dtd) +#ifdef MOZ_WEBEXTENSIONS + locale/@AB_CD@/mozapps/extensions/extensions.dtd (%chrome/mozapps/webextensions/extensions.dtd) #ifndef MOZ_FENNEC - locale/@AB_CD@/mozapps/extensions/extensions.properties (%chrome/mozapps/extensions/extensions.properties) - locale/@AB_CD@/mozapps/extensions/blocklist.dtd (%chrome/mozapps/extensions/blocklist.dtd) - locale/@AB_CD@/mozapps/extensions/about.dtd (%chrome/mozapps/extensions/about.dtd) - locale/@AB_CD@/mozapps/extensions/update.dtd (%chrome/mozapps/extensions/update.dtd) - locale/@AB_CD@/mozapps/extensions/update.properties (%chrome/mozapps/extensions/update.properties) - locale/@AB_CD@/mozapps/extensions/newaddon.dtd (%chrome/mozapps/extensions/newaddon.dtd) - locale/@AB_CD@/mozapps/extensions/newaddon.properties (%chrome/mozapps/extensions/newaddon.properties) + locale/@AB_CD@/mozapps/extensions/extensions.properties (%chrome/mozapps/webextensions/extensions.properties) + locale/@AB_CD@/mozapps/extensions/blocklist.dtd (%chrome/mozapps/webextensions/blocklist.dtd) + locale/@AB_CD@/mozapps/extensions/about.dtd (%chrome/mozapps/webextensions/about.dtd) + locale/@AB_CD@/mozapps/extensions/update.dtd (%chrome/mozapps/webextensions/update.dtd) + locale/@AB_CD@/mozapps/extensions/update.properties (%chrome/mozapps/webextensions/update.properties) + locale/@AB_CD@/mozapps/extensions/newaddon.dtd (%chrome/mozapps/webextensions/newaddon.dtd) + locale/@AB_CD@/mozapps/extensions/newaddon.properties (%chrome/mozapps/webextensions/newaddon.properties) +#endif #endif locale/@AB_CD@/mozapps/handling/handling.dtd (%chrome/mozapps/handling/handling.dtd) locale/@AB_CD@/mozapps/handling/handling.properties (%chrome/mozapps/handling/handling.properties) @@ -128,8 +130,10 @@ locale/@AB_CD@/mozapps/update/updates.properties (%chrome/mozapps/update/updates.properties) #endif locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd) - locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/extensions/xpinstallConfirm.dtd) - locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/extensions/xpinstallConfirm.properties) +#ifdef MOZ_WEBEXTENSIONS + locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/webextensions/xpinstallConfirm.dtd) + locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/webextensions/xpinstallConfirm.properties) +#endif % locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/ locale/@AB_CD@/pluginproblem/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd) % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/ diff --git a/toolkit/moz.build b/toolkit/moz.build index f3159137c..9501938ae 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -13,7 +13,6 @@ DIRS += [ 'locales', 'modules', 'mozapps/downloads', - 'mozapps/extensions', 'mozapps/handling', 'mozapps/preferences', 'obsolete', @@ -22,6 +21,9 @@ DIRS += [ 'themes', ] +if CONFIG['MOZ_WEBEXTENSIONS']: + DIRS += ['mozapps/webextensions'] + if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': DIRS += ['mozapps/update'] diff --git a/toolkit/mozapps/extensions/.eslintrc.js b/toolkit/mozapps/webextensions/.eslintrc.js similarity index 100% rename from toolkit/mozapps/extensions/.eslintrc.js rename to toolkit/mozapps/webextensions/.eslintrc.js diff --git a/toolkit/mozapps/extensions/AddonContentPolicy.cpp b/toolkit/mozapps/webextensions/AddonContentPolicy.cpp similarity index 100% rename from toolkit/mozapps/extensions/AddonContentPolicy.cpp rename to toolkit/mozapps/webextensions/AddonContentPolicy.cpp diff --git a/toolkit/mozapps/extensions/AddonContentPolicy.h b/toolkit/mozapps/webextensions/AddonContentPolicy.h similarity index 100% rename from toolkit/mozapps/extensions/AddonContentPolicy.h rename to toolkit/mozapps/webextensions/AddonContentPolicy.h diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/webextensions/AddonManager.jsm similarity index 100% rename from toolkit/mozapps/extensions/AddonManager.jsm rename to toolkit/mozapps/webextensions/AddonManager.jsm diff --git a/toolkit/mozapps/extensions/AddonManagerWebAPI.cpp b/toolkit/mozapps/webextensions/AddonManagerWebAPI.cpp similarity index 100% rename from toolkit/mozapps/extensions/AddonManagerWebAPI.cpp rename to toolkit/mozapps/webextensions/AddonManagerWebAPI.cpp diff --git a/toolkit/mozapps/extensions/AddonManagerWebAPI.h b/toolkit/mozapps/webextensions/AddonManagerWebAPI.h similarity index 100% rename from toolkit/mozapps/extensions/AddonManagerWebAPI.h rename to toolkit/mozapps/webextensions/AddonManagerWebAPI.h diff --git a/toolkit/mozapps/extensions/AddonPathService.cpp b/toolkit/mozapps/webextensions/AddonPathService.cpp similarity index 100% rename from toolkit/mozapps/extensions/AddonPathService.cpp rename to toolkit/mozapps/webextensions/AddonPathService.cpp diff --git a/toolkit/mozapps/extensions/AddonPathService.h b/toolkit/mozapps/webextensions/AddonPathService.h similarity index 100% rename from toolkit/mozapps/extensions/AddonPathService.h rename to toolkit/mozapps/webextensions/AddonPathService.h diff --git a/toolkit/mozapps/extensions/ChromeManifestParser.jsm b/toolkit/mozapps/webextensions/ChromeManifestParser.jsm similarity index 100% rename from toolkit/mozapps/extensions/ChromeManifestParser.jsm rename to toolkit/mozapps/webextensions/ChromeManifestParser.jsm diff --git a/toolkit/mozapps/extensions/DeferredSave.jsm b/toolkit/mozapps/webextensions/DeferredSave.jsm similarity index 100% rename from toolkit/mozapps/extensions/DeferredSave.jsm rename to toolkit/mozapps/webextensions/DeferredSave.jsm diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/mozapps/webextensions/LightweightThemeManager.jsm similarity index 100% rename from toolkit/mozapps/extensions/LightweightThemeManager.jsm rename to toolkit/mozapps/webextensions/LightweightThemeManager.jsm diff --git a/toolkit/mozapps/extensions/addonManager.js b/toolkit/mozapps/webextensions/addonManager.js similarity index 100% rename from toolkit/mozapps/extensions/addonManager.js rename to toolkit/mozapps/webextensions/addonManager.js diff --git a/toolkit/mozapps/extensions/amContentHandler.js b/toolkit/mozapps/webextensions/amContentHandler.js similarity index 100% rename from toolkit/mozapps/extensions/amContentHandler.js rename to toolkit/mozapps/webextensions/amContentHandler.js diff --git a/toolkit/mozapps/extensions/amIAddonManager.idl b/toolkit/mozapps/webextensions/amIAddonManager.idl similarity index 100% rename from toolkit/mozapps/extensions/amIAddonManager.idl rename to toolkit/mozapps/webextensions/amIAddonManager.idl diff --git a/toolkit/mozapps/extensions/amIAddonPathService.idl b/toolkit/mozapps/webextensions/amIAddonPathService.idl similarity index 100% rename from toolkit/mozapps/extensions/amIAddonPathService.idl rename to toolkit/mozapps/webextensions/amIAddonPathService.idl diff --git a/toolkit/mozapps/extensions/amIWebInstallListener.idl b/toolkit/mozapps/webextensions/amIWebInstallListener.idl similarity index 100% rename from toolkit/mozapps/extensions/amIWebInstallListener.idl rename to toolkit/mozapps/webextensions/amIWebInstallListener.idl diff --git a/toolkit/mozapps/extensions/amIWebInstaller.idl b/toolkit/mozapps/webextensions/amIWebInstaller.idl similarity index 100% rename from toolkit/mozapps/extensions/amIWebInstaller.idl rename to toolkit/mozapps/webextensions/amIWebInstaller.idl diff --git a/toolkit/mozapps/extensions/amInstallTrigger.js b/toolkit/mozapps/webextensions/amInstallTrigger.js similarity index 100% rename from toolkit/mozapps/extensions/amInstallTrigger.js rename to toolkit/mozapps/webextensions/amInstallTrigger.js diff --git a/toolkit/mozapps/extensions/amWebAPI.js b/toolkit/mozapps/webextensions/amWebAPI.js similarity index 100% rename from toolkit/mozapps/extensions/amWebAPI.js rename to toolkit/mozapps/webextensions/amWebAPI.js diff --git a/toolkit/mozapps/extensions/amWebInstallListener.js b/toolkit/mozapps/webextensions/amWebInstallListener.js similarity index 100% rename from toolkit/mozapps/extensions/amWebInstallListener.js rename to toolkit/mozapps/webextensions/amWebInstallListener.js diff --git a/toolkit/mozapps/extensions/content/OpenH264-license.txt b/toolkit/mozapps/webextensions/content/OpenH264-license.txt similarity index 100% rename from toolkit/mozapps/extensions/content/OpenH264-license.txt rename to toolkit/mozapps/webextensions/content/OpenH264-license.txt diff --git a/toolkit/mozapps/extensions/content/about.js b/toolkit/mozapps/webextensions/content/about.js similarity index 100% rename from toolkit/mozapps/extensions/content/about.js rename to toolkit/mozapps/webextensions/content/about.js diff --git a/toolkit/mozapps/extensions/content/about.xul b/toolkit/mozapps/webextensions/content/about.xul similarity index 100% rename from toolkit/mozapps/extensions/content/about.xul rename to toolkit/mozapps/webextensions/content/about.xul diff --git a/toolkit/mozapps/extensions/content/blocklist.css b/toolkit/mozapps/webextensions/content/blocklist.css similarity index 100% rename from toolkit/mozapps/extensions/content/blocklist.css rename to toolkit/mozapps/webextensions/content/blocklist.css diff --git a/toolkit/mozapps/extensions/content/blocklist.js b/toolkit/mozapps/webextensions/content/blocklist.js similarity index 100% rename from toolkit/mozapps/extensions/content/blocklist.js rename to toolkit/mozapps/webextensions/content/blocklist.js diff --git a/toolkit/mozapps/extensions/content/blocklist.xml b/toolkit/mozapps/webextensions/content/blocklist.xml similarity index 100% rename from toolkit/mozapps/extensions/content/blocklist.xml rename to toolkit/mozapps/webextensions/content/blocklist.xml diff --git a/toolkit/mozapps/extensions/content/blocklist.xul b/toolkit/mozapps/webextensions/content/blocklist.xul similarity index 100% rename from toolkit/mozapps/extensions/content/blocklist.xul rename to toolkit/mozapps/webextensions/content/blocklist.xul diff --git a/toolkit/mozapps/extensions/content/eula.js b/toolkit/mozapps/webextensions/content/eula.js similarity index 100% rename from toolkit/mozapps/extensions/content/eula.js rename to toolkit/mozapps/webextensions/content/eula.js diff --git a/toolkit/mozapps/extensions/content/eula.xul b/toolkit/mozapps/webextensions/content/eula.xul similarity index 100% rename from toolkit/mozapps/extensions/content/eula.xul rename to toolkit/mozapps/webextensions/content/eula.xul diff --git a/toolkit/mozapps/extensions/content/extensions.css b/toolkit/mozapps/webextensions/content/extensions.css similarity index 100% rename from toolkit/mozapps/extensions/content/extensions.css rename to toolkit/mozapps/webextensions/content/extensions.css diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/webextensions/content/extensions.js similarity index 100% rename from toolkit/mozapps/extensions/content/extensions.js rename to toolkit/mozapps/webextensions/content/extensions.js diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/webextensions/content/extensions.xml similarity index 100% rename from toolkit/mozapps/extensions/content/extensions.xml rename to toolkit/mozapps/webextensions/content/extensions.xml diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/webextensions/content/extensions.xul similarity index 100% rename from toolkit/mozapps/extensions/content/extensions.xul rename to toolkit/mozapps/webextensions/content/extensions.xul diff --git a/toolkit/mozapps/extensions/content/gmpPrefs.xul b/toolkit/mozapps/webextensions/content/gmpPrefs.xul similarity index 100% rename from toolkit/mozapps/extensions/content/gmpPrefs.xul rename to toolkit/mozapps/webextensions/content/gmpPrefs.xul diff --git a/toolkit/mozapps/extensions/content/list.js b/toolkit/mozapps/webextensions/content/list.js similarity index 100% rename from toolkit/mozapps/extensions/content/list.js rename to toolkit/mozapps/webextensions/content/list.js diff --git a/toolkit/mozapps/extensions/content/list.xul b/toolkit/mozapps/webextensions/content/list.xul similarity index 100% rename from toolkit/mozapps/extensions/content/list.xul rename to toolkit/mozapps/webextensions/content/list.xul diff --git a/toolkit/mozapps/extensions/content/newaddon.js b/toolkit/mozapps/webextensions/content/newaddon.js similarity index 100% rename from toolkit/mozapps/extensions/content/newaddon.js rename to toolkit/mozapps/webextensions/content/newaddon.js diff --git a/toolkit/mozapps/extensions/content/newaddon.xul b/toolkit/mozapps/webextensions/content/newaddon.xul similarity index 100% rename from toolkit/mozapps/extensions/content/newaddon.xul rename to toolkit/mozapps/webextensions/content/newaddon.xul diff --git a/toolkit/mozapps/extensions/content/pluginPrefs.xul b/toolkit/mozapps/webextensions/content/pluginPrefs.xul similarity index 100% rename from toolkit/mozapps/extensions/content/pluginPrefs.xul rename to toolkit/mozapps/webextensions/content/pluginPrefs.xul diff --git a/toolkit/mozapps/extensions/content/setting.xml b/toolkit/mozapps/webextensions/content/setting.xml similarity index 100% rename from toolkit/mozapps/extensions/content/setting.xml rename to toolkit/mozapps/webextensions/content/setting.xml diff --git a/toolkit/mozapps/extensions/content/update.js b/toolkit/mozapps/webextensions/content/update.js similarity index 100% rename from toolkit/mozapps/extensions/content/update.js rename to toolkit/mozapps/webextensions/content/update.js diff --git a/toolkit/mozapps/extensions/content/update.xul b/toolkit/mozapps/webextensions/content/update.xul similarity index 100% rename from toolkit/mozapps/extensions/content/update.xul rename to toolkit/mozapps/webextensions/content/update.xul diff --git a/toolkit/mozapps/extensions/content/updateinfo.xsl b/toolkit/mozapps/webextensions/content/updateinfo.xsl similarity index 100% rename from toolkit/mozapps/extensions/content/updateinfo.xsl rename to toolkit/mozapps/webextensions/content/updateinfo.xsl diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.css b/toolkit/mozapps/webextensions/content/xpinstallConfirm.css similarity index 100% rename from toolkit/mozapps/extensions/content/xpinstallConfirm.css rename to toolkit/mozapps/webextensions/content/xpinstallConfirm.css diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.js b/toolkit/mozapps/webextensions/content/xpinstallConfirm.js similarity index 100% rename from toolkit/mozapps/extensions/content/xpinstallConfirm.js rename to toolkit/mozapps/webextensions/content/xpinstallConfirm.js diff --git a/toolkit/mozapps/extensions/content/xpinstallConfirm.xul b/toolkit/mozapps/webextensions/content/xpinstallConfirm.xul similarity index 100% rename from toolkit/mozapps/extensions/content/xpinstallConfirm.xul rename to toolkit/mozapps/webextensions/content/xpinstallConfirm.xul diff --git a/toolkit/mozapps/extensions/content/xpinstallItem.xml b/toolkit/mozapps/webextensions/content/xpinstallItem.xml similarity index 100% rename from toolkit/mozapps/extensions/content/xpinstallItem.xml rename to toolkit/mozapps/webextensions/content/xpinstallItem.xml diff --git a/toolkit/mozapps/extensions/docs/SystemAddons.rst b/toolkit/mozapps/webextensions/docs/SystemAddons.rst similarity index 100% rename from toolkit/mozapps/extensions/docs/SystemAddons.rst rename to toolkit/mozapps/webextensions/docs/SystemAddons.rst diff --git a/toolkit/mozapps/extensions/docs/index.rst b/toolkit/mozapps/webextensions/docs/index.rst similarity index 100% rename from toolkit/mozapps/extensions/docs/index.rst rename to toolkit/mozapps/webextensions/docs/index.rst diff --git a/toolkit/mozapps/extensions/extensions.manifest b/toolkit/mozapps/webextensions/extensions.manifest similarity index 100% rename from toolkit/mozapps/extensions/extensions.manifest rename to toolkit/mozapps/webextensions/extensions.manifest diff --git a/toolkit/mozapps/extensions/internal/APIExtensionBootstrap.js b/toolkit/mozapps/webextensions/internal/APIExtensionBootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/internal/APIExtensionBootstrap.js rename to toolkit/mozapps/webextensions/internal/APIExtensionBootstrap.js diff --git a/toolkit/mozapps/extensions/internal/AddonConstants.jsm b/toolkit/mozapps/webextensions/internal/AddonConstants.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/AddonConstants.jsm rename to toolkit/mozapps/webextensions/internal/AddonConstants.jsm diff --git a/toolkit/mozapps/extensions/internal/AddonLogging.jsm b/toolkit/mozapps/webextensions/internal/AddonLogging.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/AddonLogging.jsm rename to toolkit/mozapps/webextensions/internal/AddonLogging.jsm diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/mozapps/webextensions/internal/AddonRepository.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/AddonRepository.jsm rename to toolkit/mozapps/webextensions/internal/AddonRepository.jsm diff --git a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm b/toolkit/mozapps/webextensions/internal/AddonRepository_SQLiteMigrator.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm rename to toolkit/mozapps/webextensions/internal/AddonRepository_SQLiteMigrator.jsm diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm b/toolkit/mozapps/webextensions/internal/AddonTestUtils.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/AddonTestUtils.jsm rename to toolkit/mozapps/webextensions/internal/AddonTestUtils.jsm diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm rename to toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm diff --git a/toolkit/mozapps/extensions/internal/Content.js b/toolkit/mozapps/webextensions/internal/Content.js similarity index 100% rename from toolkit/mozapps/extensions/internal/Content.js rename to toolkit/mozapps/webextensions/internal/Content.js diff --git a/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm b/toolkit/mozapps/webextensions/internal/E10SAddonsRollout.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm rename to toolkit/mozapps/webextensions/internal/E10SAddonsRollout.jsm diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/webextensions/internal/GMPProvider.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/GMPProvider.jsm rename to toolkit/mozapps/webextensions/internal/GMPProvider.jsm diff --git a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm b/toolkit/mozapps/webextensions/internal/LightweightThemeImageOptimizer.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm rename to toolkit/mozapps/webextensions/internal/LightweightThemeImageOptimizer.jsm diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/mozapps/webextensions/internal/PluginProvider.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/PluginProvider.jsm rename to toolkit/mozapps/webextensions/internal/PluginProvider.jsm diff --git a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm b/toolkit/mozapps/webextensions/internal/ProductAddonChecker.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm rename to toolkit/mozapps/webextensions/internal/ProductAddonChecker.jsm diff --git a/toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js b/toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js rename to toolkit/mozapps/webextensions/internal/SpellCheckDictionaryBootstrap.js diff --git a/toolkit/mozapps/extensions/internal/WebExtensionBootstrap.js b/toolkit/mozapps/webextensions/internal/WebExtensionBootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/internal/WebExtensionBootstrap.js rename to toolkit/mozapps/webextensions/internal/WebExtensionBootstrap.js diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm similarity index 100% rename from toolkit/mozapps/extensions/internal/XPIProvider.jsm rename to toolkit/mozapps/webextensions/internal/XPIProvider.jsm diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/mozapps/webextensions/internal/XPIProviderUtils.js similarity index 100% rename from toolkit/mozapps/extensions/internal/XPIProviderUtils.js rename to toolkit/mozapps/webextensions/internal/XPIProviderUtils.js diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/webextensions/internal/moz.build similarity index 100% rename from toolkit/mozapps/extensions/internal/moz.build rename to toolkit/mozapps/webextensions/internal/moz.build diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/webextensions/jar.mn similarity index 100% rename from toolkit/mozapps/extensions/jar.mn rename to toolkit/mozapps/webextensions/jar.mn diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/webextensions/moz.build similarity index 100% rename from toolkit/mozapps/extensions/moz.build rename to toolkit/mozapps/webextensions/moz.build diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/webextensions/nsBlocklistService.js similarity index 100% rename from toolkit/mozapps/extensions/nsBlocklistService.js rename to toolkit/mozapps/webextensions/nsBlocklistService.js diff --git a/toolkit/mozapps/extensions/nsBlocklistServiceContent.js b/toolkit/mozapps/webextensions/nsBlocklistServiceContent.js similarity index 100% rename from toolkit/mozapps/extensions/nsBlocklistServiceContent.js rename to toolkit/mozapps/webextensions/nsBlocklistServiceContent.js diff --git a/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm b/toolkit/mozapps/webextensions/test/AddonManagerTesting.jsm similarity index 100% rename from toolkit/mozapps/extensions/test/AddonManagerTesting.jsm rename to toolkit/mozapps/webextensions/test/AddonManagerTesting.jsm diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/webextensions/test/Makefile.in similarity index 100% rename from toolkit/mozapps/extensions/test/Makefile.in rename to toolkit/mozapps/webextensions/test/Makefile.in diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_hard1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_hard1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_hard1_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_hard1_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_regexp1_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft1_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft1_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft2_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft2_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft2_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft2_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft3_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft3_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft3_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft3_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft4_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft4_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft4_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft4_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft5_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft5_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/blocklist_soft5_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/blocklist_soft5_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/bootstrap_globals/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/bootstrap_globals/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf b/toolkit/mozapps/webextensions/test/addons/bootstrap_globals/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf rename to toolkit/mozapps/webextensions/test/addons/bootstrap_globals/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/min1max1/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/min1max1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/min1max1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/min1max2/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/min1max2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/min1max2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/min1max3/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/min1max3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/min1max3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf b/toolkit/mozapps/webextensions/test/addons/min1max3b/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf rename to toolkit/mozapps/webextensions/test/addons/min1max3b/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf b/toolkit/mozapps/webextensions/test/addons/override1x2-1x3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/override1x2-1x3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_AddonRepository_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_AddonRepository_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/icon.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png rename to toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/icon.png diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png b/toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/preview.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png rename to toolkit/mozapps/webextensions/test/addons/test_AddonRepository_3/preview.png diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/version.jsm similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_1/version.jsm diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/version.jsm similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_2/version.jsm diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/version.jsm similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_3/version.jsm diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap1_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap1_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap2_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bootstrap_const/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_a_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_a_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_a_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_a_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_b_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_b_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_b_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_b_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_c_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_c_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_c_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_c_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_d_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_d_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_d_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_d_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_e_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_e_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_e_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_e_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_f_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_f_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_f_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_f_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_g_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_g_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug299716_g_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug299716_g_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_5/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_6/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_7/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_7/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_8/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_8/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug324121_9/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug324121_9/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug335238_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug335238_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug335238_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug335238_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug335238_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug371495/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug371495/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug394300_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug394300_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug394300_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug394300_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug397778/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug397778/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug425657/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug425657/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug470377_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug470377_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug470377_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug470377_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug470377_5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug470377_5/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug521905/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug521905/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug567173/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug567173/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug567184/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bug567184/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug567184/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug567184/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug587088_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile rename to toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1 b/toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile1 similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1 rename to toolkit/mozapps/webextensions/test/addons/test_bug587088_1/testfile1 diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug587088_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile rename to toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2 b/toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile2 similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2 rename to toolkit/mozapps/webextensions/test/addons/test_bug587088_2/testfile2 diff --git a/toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1 b/toolkit/mozapps/webextensions/test/addons/test_bug594058/directory/file1 similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1 rename to toolkit/mozapps/webextensions/test/addons/test_bug594058/directory/file1 diff --git a/toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug594058/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug594058/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug595573/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug595573/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug655254/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug655254/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug655254_2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bug655254_2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug655254_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug655254_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug659772/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug659772/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_bug675371/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_bug675371/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug675371/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug675371/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js b/toolkit/mozapps/webextensions/test/addons/test_bug675371/test.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug675371/test.js rename to toolkit/mozapps/webextensions/test/addons/test_bug675371/test.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug740612_1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bug740612_1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug740612_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug740612_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_bug740612_2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_bug740612_2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug740612_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug740612_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_bug757663/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_bug757663/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_cacheflush1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_cacheflush1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_cacheflush2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_cacheflush2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/inner.jar similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/inner.jar diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/components.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/components.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/other/something.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/components/other/something.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_5/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_chromemanifest_6/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_data_directory/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_data_directory/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_db_sanity_1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_v2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json b/toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_v2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json b/toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_v2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json b/toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json rename to toolkit/mozapps/webextensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_dictionary/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_dictionary/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic b/toolkit/mozapps/webextensions/test/addons/test_dictionary/dictionaries/ab-CD.dic similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic rename to toolkit/mozapps/webextensions/test/addons/test_dictionary/dictionaries/ab-CD.dic diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_dictionary/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic b/toolkit/mozapps/webextensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic rename to toolkit/mozapps/webextensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_dictionary_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_dictionary_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_dictionary_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_dictionary_5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_dictionary_5/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_distribution1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_distribution1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_experiment1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_experiment1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_experiment1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_experiment1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_filepointer/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_filepointer/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/icon.png b/toolkit/mozapps/webextensions/test/addons/test_getresource/icon.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_getresource/icon.png rename to toolkit/mozapps/webextensions/test/addons/test_getresource/icon.png diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_getresource/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_getresource/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt b/toolkit/mozapps/webextensions/test/addons/test_getresource/subdir/subfile.txt similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt rename to toolkit/mozapps/webextensions/test/addons/test_getresource/subdir/subfile.txt diff --git a/toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_hotfix_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_hotfix_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_hotfix_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_hotfix_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/icon.png b/toolkit/mozapps/webextensions/test/addons/test_install1/icon.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install1/icon.png rename to toolkit/mozapps/webextensions/test/addons/test_install1/icon.png diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/icon64.png b/toolkit/mozapps/webextensions/test/addons/test_install1/icon64.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install1/icon64.png rename to toolkit/mozapps/webextensions/test/addons/test_install1/icon64.png diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png b/toolkit/mozapps/webextensions/test/addons/test_install2_1/icon.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png rename to toolkit/mozapps/webextensions/test/addons/test_install2_1/icon.png diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install2_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install2_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install2_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install2_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install3/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install3/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi b/toolkit/mozapps/webextensions/test/addons/test_install4/addon4.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi rename to toolkit/mozapps/webextensions/test/addons/test_install4/addon4.xpi diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar b/toolkit/mozapps/webextensions/test/addons/test_install4/addon5.jar similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar rename to toolkit/mozapps/webextensions/test/addons/test_install4/addon5.jar diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi b/toolkit/mozapps/webextensions/test/addons/test_install4/addon6.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi rename to toolkit/mozapps/webextensions/test/addons/test_install4/addon6.xpi diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar b/toolkit/mozapps/webextensions/test/addons/test_install4/addon7.jar similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar rename to toolkit/mozapps/webextensions/test/addons/test_install4/addon7.jar diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar b/toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.jar similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar rename to toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.jar diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi b/toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi rename to toolkit/mozapps/webextensions/test/addons/test_install4/badaddon.xpi diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/icon.png b/toolkit/mozapps/webextensions/test/addons/test_install4/icon.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/icon.png rename to toolkit/mozapps/webextensions/test/addons/test_install4/icon.png diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install4/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install4/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_install5/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_install5/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_install5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install5/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install5/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install6/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install6/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi b/toolkit/mozapps/webextensions/test/addons/test_install7/addon1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi rename to toolkit/mozapps/webextensions/test/addons/test_install7/addon1.xpi diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi b/toolkit/mozapps/webextensions/test/addons/test_install7/addon2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi rename to toolkit/mozapps/webextensions/test/addons/test_install7/addon2.xpi diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install7/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install7/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install7/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_install8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_install8/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_install8/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_install8/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_jetpack/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_jetpack/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json b/toolkit/mozapps/webextensions/test/addons/test_jetpack/harness-options.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json rename to toolkit/mozapps/webextensions/test/addons/test_jetpack/harness-options.json diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_jetpack/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_jetpack/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_langpack/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_langpack/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_langpack/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_langpack/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_locale/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_locale/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_locale/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_locale/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_locked2_5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_locked2_5/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_locked2_6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_locked2_6/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate4_6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_migrate4_6/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate4_7/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_migrate4_7/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_migrate6/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate7/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_migrate7/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/test_migrate8/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/test_migrate8/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate8/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_migrate8/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_migrate9/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_migrate9/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_symbol/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_symbol/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_symbol/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_symbol/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_theme/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_theme/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_theme/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_theme/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_theme/preview.png b/toolkit/mozapps/webextensions/test/addons/test_theme/preview.png similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_theme/preview.png rename to toolkit/mozapps/webextensions/test/addons/test_theme/preview.png diff --git a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_undoincompatible/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_undoincompatible/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_undoincompatible/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_undoincompatible/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_undouninstall1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_undouninstall1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_undouninstall1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_undouninstall1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_update/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_update/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_update12/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update12/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update12/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_update12/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_update8/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update8/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update8/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_update8/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_update_multi1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_update_multi1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update_multi1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_update_multi1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi b/toolkit/mozapps/webextensions/test/addons/test_update_multi2/addon.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi rename to toolkit/mozapps/webextensions/test/addons/test_update_multi2/addon.xpi diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_update_multi2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_update_multi2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_updateid1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_updateid1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_updateid1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_updateid1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js b/toolkit/mozapps/webextensions/test/addons/test_updateid2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js rename to toolkit/mozapps/webextensions/test/addons/test_updateid2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf b/toolkit/mozapps/webextensions/test/addons/test_updateid2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/test_updateid2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf b/toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf rename to toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/upgradeable1x2-3_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest rename to toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json rename to toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json diff --git a/toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf b/toolkit/mozapps/webextensions/test/addons/webextension_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf rename to toolkit/mozapps/webextensions/test/addons/webextension_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_2/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json rename to toolkit/mozapps/webextensions/test/addons/webextension_2/manifest.json diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json b/toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/en/messages.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json rename to toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/en/messages.json diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json b/toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/fr/messages.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json rename to toolkit/mozapps/webextensions/test/addons/webextension_3/_locales/fr/messages.json diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_3/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json rename to toolkit/mozapps/webextensions/test/addons/webextension_3/manifest.json diff --git a/toolkit/mozapps/extensions/test/browser/.eslintrc.js b/toolkit/mozapps/webextensions/test/browser/.eslintrc.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/.eslintrc.js rename to toolkit/mozapps/webextensions/test/browser/.eslintrc.js diff --git a/toolkit/mozapps/extensions/test/browser/addon_about.xul b/toolkit/mozapps/webextensions/test/browser/addon_about.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addon_about.xul rename to toolkit/mozapps/webextensions/test/browser/addon_about.xul diff --git a/toolkit/mozapps/extensions/test/browser/addon_prefs.xul b/toolkit/mozapps/webextensions/test/browser/addon_prefs.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addon_prefs.xul rename to toolkit/mozapps/webextensions/test/browser/addon_prefs.xul diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_10/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_10/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_2/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_3/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_3/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_4/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_4/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_5/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_5/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_6/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_6/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_7/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_7/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_8_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_8_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug557956_9_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug557956_9_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug567127_2/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug567127_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_bug596336_2/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_bug596336_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_dragdrop2/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_dragdrop2/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_experiment1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_experiment1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_experiment1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_experiment1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_experiment1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/chrome.manifest rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/options.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/options.xul rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/options.xul diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/settings.dtd b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/settings.dtd similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1/settings.dtd rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1/settings.dtd diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/binding.xml diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/options.xul b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/options.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/options.xul rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/options.xul diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_custom/string.dtd diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/options.xul b/toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/options.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_inlinesettings1_info/options.xul rename to toolkit/mozapps/webextensions/test/browser/addons/browser_inlinesettings1_info/options.xul diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_install1_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_install1_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_install1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_install1_2.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_install1_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_install1_2/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_install1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_installssl.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_installssl.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_installssl.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_installssl.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_installssl/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_installssl/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_installssl/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_installssl/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_searching.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_searching.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_searching.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_searching/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_searching/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_searching/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_searching/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_searching/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_searching/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_searching/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_1.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/chrome.manifest rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/frame-script.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/frame-script.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/frame-script.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/frame-script.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_1/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_2.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/chrome.manifest b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/chrome.manifest similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/chrome.manifest rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/chrome.manifest diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/frame-script.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/frame-script.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/frame-script.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/frame-script.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_update1_2/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_update1_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install.xpi b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/bootstrap.js b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/bootstrap.js rename to toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/install.rdf b/toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/browser_webapi_install/install.rdf rename to toolkit/mozapps/webextensions/test/browser/addons/browser_webapi_install/install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/addons/options_signed.xpi b/toolkit/mozapps/webextensions/test/browser/addons/options_signed.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/options_signed.xpi rename to toolkit/mozapps/webextensions/test/browser/addons/options_signed.xpi diff --git a/toolkit/mozapps/extensions/test/browser/addons/options_signed/manifest.json b/toolkit/mozapps/webextensions/test/browser/addons/options_signed/manifest.json similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/options_signed/manifest.json rename to toolkit/mozapps/webextensions/test/browser/addons/options_signed/manifest.json diff --git a/toolkit/mozapps/extensions/test/browser/addons/options_signed/options.html b/toolkit/mozapps/webextensions/test/browser/addons/options_signed/options.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/addons/options_signed/options.html rename to toolkit/mozapps/webextensions/test/browser/addons/options_signed/options.html diff --git a/toolkit/mozapps/extensions/test/browser/blockNoPlugins.xml b/toolkit/mozapps/webextensions/test/browser/blockNoPlugins.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/blockNoPlugins.xml rename to toolkit/mozapps/webextensions/test/browser/blockNoPlugins.xml diff --git a/toolkit/mozapps/extensions/test/browser/blockPluginHard.xml b/toolkit/mozapps/webextensions/test/browser/blockPluginHard.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/blockPluginHard.xml rename to toolkit/mozapps/webextensions/test/browser/blockPluginHard.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser-common.ini b/toolkit/mozapps/webextensions/test/browser/browser-common.ini similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser-common.ini rename to toolkit/mozapps/webextensions/test/browser/browser-common.ini diff --git a/toolkit/mozapps/extensions/test/browser/browser-window.ini b/toolkit/mozapps/webextensions/test/browser/browser-window.ini similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser-window.ini rename to toolkit/mozapps/webextensions/test/browser/browser-window.ini diff --git a/toolkit/mozapps/extensions/test/browser/browser.ini b/toolkit/mozapps/webextensions/test/browser/browser.ini similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser.ini rename to toolkit/mozapps/webextensions/test/browser/browser.ini diff --git a/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js b/toolkit/mozapps/webextensions/test/browser/browser_CTP_plugins.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js rename to toolkit/mozapps/webextensions/test/browser/browser_CTP_plugins.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_about.js b/toolkit/mozapps/webextensions/test/browser/browser_about.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_about.js rename to toolkit/mozapps/webextensions/test/browser/browser_about.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js b/toolkit/mozapps/webextensions/test/browser/browser_addonrepository_performance.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_addonrepository_performance.js rename to toolkit/mozapps/webextensions/test/browser/browser_addonrepository_performance.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js b/toolkit/mozapps/webextensions/test/browser/browser_bug523784.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug523784.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug523784.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557943.js b/toolkit/mozapps/webextensions/test/browser/browser_bug557943.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug557943.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug557943.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.js b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug557956.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug557956.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.rdf b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug557956.rdf rename to toolkit/mozapps/webextensions/test/browser/browser_bug557956.rdf diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956.xml b/toolkit/mozapps/webextensions/test/browser/browser_bug557956.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug557956.xml rename to toolkit/mozapps/webextensions/test/browser/browser_bug557956.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956_8_2.xpi b/toolkit/mozapps/webextensions/test/browser/browser_bug557956_8_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug557956_8_2.xpi rename to toolkit/mozapps/webextensions/test/browser/browser_bug557956_8_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug557956_9_2.xpi b/toolkit/mozapps/webextensions/test/browser/browser_bug557956_9_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug557956_9_2.xpi rename to toolkit/mozapps/webextensions/test/browser/browser_bug557956_9_2.xpi diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562797.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug562797.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug562797.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562854.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562854.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug562854.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug562854.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562890.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562890.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug562890.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug562890.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562899.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562899.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug562899.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug562899.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug562992.js b/toolkit/mozapps/webextensions/test/browser/browser_bug562992.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug562992.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug562992.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug567127.js b/toolkit/mozapps/webextensions/test/browser/browser_bug567127.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug567127.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug567127.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug567137.js b/toolkit/mozapps/webextensions/test/browser/browser_bug567137.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug567137.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug567137.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug570760.js b/toolkit/mozapps/webextensions/test/browser/browser_bug570760.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug570760.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug570760.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug572561.js b/toolkit/mozapps/webextensions/test/browser/browser_bug572561.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug572561.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug572561.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug573062.js b/toolkit/mozapps/webextensions/test/browser/browser_bug573062.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug573062.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug573062.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug577990.js b/toolkit/mozapps/webextensions/test/browser/browser_bug577990.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug577990.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug577990.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug580298.js b/toolkit/mozapps/webextensions/test/browser/browser_bug580298.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug580298.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug580298.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug581076.js b/toolkit/mozapps/webextensions/test/browser/browser_bug581076.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug581076.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug581076.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug586574.js b/toolkit/mozapps/webextensions/test/browser/browser_bug586574.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug586574.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug586574.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js b/toolkit/mozapps/webextensions/test/browser/browser_bug587970.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug587970.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug587970.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug590347.js b/toolkit/mozapps/webextensions/test/browser/browser_bug590347.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug590347.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug590347.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591465.js b/toolkit/mozapps/webextensions/test/browser/browser_bug591465.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug591465.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug591465.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591465.xml b/toolkit/mozapps/webextensions/test/browser/browser_bug591465.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug591465.xml rename to toolkit/mozapps/webextensions/test/browser/browser_bug591465.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js b/toolkit/mozapps/webextensions/test/browser/browser_bug591663.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug591663.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug591663.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug593535.js b/toolkit/mozapps/webextensions/test/browser/browser_bug593535.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug593535.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug593535.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug593535.xml b/toolkit/mozapps/webextensions/test/browser/browser_bug593535.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug593535.xml rename to toolkit/mozapps/webextensions/test/browser/browser_bug593535.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug596336.js b/toolkit/mozapps/webextensions/test/browser/browser_bug596336.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug596336.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug596336.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug608316.js b/toolkit/mozapps/webextensions/test/browser/browser_bug608316.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug608316.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug608316.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug610764.js b/toolkit/mozapps/webextensions/test/browser/browser_bug610764.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug610764.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug610764.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug616841.js b/toolkit/mozapps/webextensions/test/browser/browser_bug616841.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug616841.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug616841.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug618502.js b/toolkit/mozapps/webextensions/test/browser/browser_bug618502.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug618502.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug618502.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug679604.js b/toolkit/mozapps/webextensions/test/browser/browser_bug679604.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug679604.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug679604.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug714593.js b/toolkit/mozapps/webextensions/test/browser/browser_bug714593.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_bug714593.js rename to toolkit/mozapps/webextensions/test/browser/browser_bug714593.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_cancelCompatCheck.js b/toolkit/mozapps/webextensions/test/browser/browser_cancelCompatCheck.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_cancelCompatCheck.js rename to toolkit/mozapps/webextensions/test/browser/browser_cancelCompatCheck.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_checkAddonCompatibility.js b/toolkit/mozapps/webextensions/test/browser/browser_checkAddonCompatibility.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_checkAddonCompatibility.js rename to toolkit/mozapps/webextensions/test/browser/browser_checkAddonCompatibility.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/webextensions/test/browser/browser_details.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_details.js rename to toolkit/mozapps/webextensions/test/browser/browser_details.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_discovery.js b/toolkit/mozapps/webextensions/test/browser/browser_discovery.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_discovery.js rename to toolkit/mozapps/webextensions/test/browser/browser_discovery.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_discovery_install.js b/toolkit/mozapps/webextensions/test/browser/browser_discovery_install.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_discovery_install.js rename to toolkit/mozapps/webextensions/test/browser/browser_discovery_install.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js b/toolkit/mozapps/webextensions/test/browser/browser_dragdrop.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_dragdrop.js rename to toolkit/mozapps/webextensions/test/browser/browser_dragdrop.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_eula.js b/toolkit/mozapps/webextensions/test/browser/browser_eula.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_eula.js rename to toolkit/mozapps/webextensions/test/browser/browser_eula.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_eula.xml b/toolkit/mozapps/webextensions/test/browser/browser_eula.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_eula.xml rename to toolkit/mozapps/webextensions/test/browser/browser_eula.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_experiments.js b/toolkit/mozapps/webextensions/test/browser/browser_experiments.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_experiments.js rename to toolkit/mozapps/webextensions/test/browser/browser_experiments.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js b/toolkit/mozapps/webextensions/test/browser/browser_globalwarnings.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js rename to toolkit/mozapps/webextensions/test/browser/browser_globalwarnings.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/webextensions/test/browser/browser_gmpProvider.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js rename to toolkit/mozapps/webextensions/test/browser/browser_gmpProvider.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_hotfix.js b/toolkit/mozapps/webextensions/test/browser/browser_hotfix.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_hotfix.js rename to toolkit/mozapps/webextensions/test/browser/browser_hotfix.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_inlinesettings.js rename to toolkit/mozapps/webextensions/test/browser/browser_inlinesettings.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_browser.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js rename to toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_browser.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_custom.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_custom.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_inlinesettings_custom.js rename to toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_custom.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js b/toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_info.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js rename to toolkit/mozapps/webextensions/test/browser/browser_inlinesettings_info.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.js b/toolkit/mozapps/webextensions/test/browser/browser_install.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_install.js rename to toolkit/mozapps/webextensions/test/browser/browser_install.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.rdf b/toolkit/mozapps/webextensions/test/browser/browser_install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_install.rdf rename to toolkit/mozapps/webextensions/test/browser/browser_install.rdf diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.rdf^headers^ b/toolkit/mozapps/webextensions/test/browser/browser_install.rdf^headers^ similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_install.rdf^headers^ rename to toolkit/mozapps/webextensions/test/browser/browser_install.rdf^headers^ diff --git a/toolkit/mozapps/extensions/test/browser/browser_install.xml b/toolkit/mozapps/webextensions/test/browser/browser_install.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_install.xml rename to toolkit/mozapps/webextensions/test/browser/browser_install.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_install1_3.xpi b/toolkit/mozapps/webextensions/test/browser/browser_install1_3.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_install1_3.xpi rename to toolkit/mozapps/webextensions/test/browser/browser_install1_3.xpi diff --git a/toolkit/mozapps/extensions/test/browser/browser_installssl.js b/toolkit/mozapps/webextensions/test/browser/browser_installssl.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_installssl.js rename to toolkit/mozapps/webextensions/test/browser/browser_installssl.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/webextensions/test/browser/browser_list.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_list.js rename to toolkit/mozapps/webextensions/test/browser/browser_list.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js b/toolkit/mozapps/webextensions/test/browser/browser_manualupdates.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_manualupdates.js rename to toolkit/mozapps/webextensions/test/browser/browser_manualupdates.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_metadataTimeout.js b/toolkit/mozapps/webextensions/test/browser/browser_metadataTimeout.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_metadataTimeout.js rename to toolkit/mozapps/webextensions/test/browser/browser_metadataTimeout.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_newaddon.js b/toolkit/mozapps/webextensions/test/browser/browser_newaddon.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_newaddon.js rename to toolkit/mozapps/webextensions/test/browser/browser_newaddon.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_openDialog.js b/toolkit/mozapps/webextensions/test/browser/browser_openDialog.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_openDialog.js rename to toolkit/mozapps/webextensions/test/browser/browser_openDialog.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js b/toolkit/mozapps/webextensions/test/browser/browser_plugin_enabled_state_locked.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js rename to toolkit/mozapps/webextensions/test/browser/browser_plugin_enabled_state_locked.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js b/toolkit/mozapps/webextensions/test/browser/browser_pluginprefs.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js rename to toolkit/mozapps/webextensions/test/browser/browser_pluginprefs.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_purchase.js b/toolkit/mozapps/webextensions/test/browser/browser_purchase.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_purchase.js rename to toolkit/mozapps/webextensions/test/browser/browser_purchase.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_purchase.xml b/toolkit/mozapps/webextensions/test/browser/browser_purchase.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_purchase.xml rename to toolkit/mozapps/webextensions/test/browser/browser_purchase.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_recentupdates.js b/toolkit/mozapps/webextensions/test/browser/browser_recentupdates.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_recentupdates.js rename to toolkit/mozapps/webextensions/test/browser/browser_recentupdates.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.js b/toolkit/mozapps/webextensions/test/browser/browser_searching.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_searching.js rename to toolkit/mozapps/webextensions/test/browser/browser_searching.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching.xml b/toolkit/mozapps/webextensions/test/browser/browser_searching.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_searching.xml rename to toolkit/mozapps/webextensions/test/browser/browser_searching.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_searching_empty.xml b/toolkit/mozapps/webextensions/test/browser/browser_searching_empty.xml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_searching_empty.xml rename to toolkit/mozapps/webextensions/test/browser/browser_searching_empty.xml diff --git a/toolkit/mozapps/extensions/test/browser/browser_sorting.js b/toolkit/mozapps/webextensions/test/browser/browser_sorting.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_sorting.js rename to toolkit/mozapps/webextensions/test/browser/browser_sorting.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js b/toolkit/mozapps/webextensions/test/browser/browser_sorting_plugins.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js rename to toolkit/mozapps/webextensions/test/browser/browser_sorting_plugins.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_system_addons_are_e10s.js b/toolkit/mozapps/webextensions/test/browser/browser_system_addons_are_e10s.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_system_addons_are_e10s.js rename to toolkit/mozapps/webextensions/test/browser/browser_system_addons_are_e10s.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_tabsettings.js b/toolkit/mozapps/webextensions/test/browser/browser_tabsettings.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_tabsettings.js rename to toolkit/mozapps/webextensions/test/browser/browser_tabsettings.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_task_next_test.js b/toolkit/mozapps/webextensions/test/browser/browser_task_next_test.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_task_next_test.js rename to toolkit/mozapps/webextensions/test/browser/browser_task_next_test.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_types.js b/toolkit/mozapps/webextensions/test/browser/browser_types.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_types.js rename to toolkit/mozapps/webextensions/test/browser/browser_types.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_uninstalling.js b/toolkit/mozapps/webextensions/test/browser/browser_uninstalling.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_uninstalling.js rename to toolkit/mozapps/webextensions/test/browser/browser_uninstalling.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_update.js b/toolkit/mozapps/webextensions/test/browser/browser_update.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_update.js rename to toolkit/mozapps/webextensions/test/browser/browser_update.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_updateid.js b/toolkit/mozapps/webextensions/test/browser/browser_updateid.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_updateid.js rename to toolkit/mozapps/webextensions/test/browser/browser_updateid.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.js b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_updatessl.js rename to toolkit/mozapps/webextensions/test/browser/browser_updatessl.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf rename to toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf^headers^ b/toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf^headers^ similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_updatessl.rdf^headers^ rename to toolkit/mozapps/webextensions/test/browser/browser_updatessl.rdf^headers^ diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webapi.js rename to toolkit/mozapps/webextensions/test/browser/browser_webapi.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_access.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_access.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webapi_access.js rename to toolkit/mozapps/webextensions/test/browser/browser_webapi_access.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_addon_listener.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_addon_listener.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webapi_addon_listener.js rename to toolkit/mozapps/webextensions/test/browser/browser_webapi_addon_listener.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_enable.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_enable.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webapi_enable.js rename to toolkit/mozapps/webextensions/test/browser/browser_webapi_enable.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_install.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webapi_install.js rename to toolkit/mozapps/webextensions/test/browser/browser_webapi_install.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_uninstall.js b/toolkit/mozapps/webextensions/test/browser/browser_webapi_uninstall.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webapi_uninstall.js rename to toolkit/mozapps/webextensions/test/browser/browser_webapi_uninstall.js diff --git a/toolkit/mozapps/extensions/test/browser/browser_webext_options.js b/toolkit/mozapps/webextensions/test/browser/browser_webext_options.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/browser_webext_options.js rename to toolkit/mozapps/webextensions/test/browser/browser_webext_options.js diff --git a/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs b/toolkit/mozapps/webextensions/test/browser/cancelCompatCheck.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs rename to toolkit/mozapps/webextensions/test/browser/cancelCompatCheck.sjs diff --git a/toolkit/mozapps/extensions/test/browser/discovery.html b/toolkit/mozapps/webextensions/test/browser/discovery.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/discovery.html rename to toolkit/mozapps/webextensions/test/browser/discovery.html diff --git a/toolkit/mozapps/extensions/test/browser/discovery_frame.html b/toolkit/mozapps/webextensions/test/browser/discovery_frame.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/discovery_frame.html rename to toolkit/mozapps/webextensions/test/browser/discovery_frame.html diff --git a/toolkit/mozapps/extensions/test/browser/discovery_install.html b/toolkit/mozapps/webextensions/test/browser/discovery_install.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/discovery_install.html rename to toolkit/mozapps/webextensions/test/browser/discovery_install.html diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/webextensions/test/browser/head.js similarity index 100% rename from toolkit/mozapps/extensions/test/browser/head.js rename to toolkit/mozapps/webextensions/test/browser/head.js diff --git a/toolkit/mozapps/extensions/test/browser/more_options.xul b/toolkit/mozapps/webextensions/test/browser/more_options.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/more_options.xul rename to toolkit/mozapps/webextensions/test/browser/more_options.xul diff --git a/toolkit/mozapps/extensions/test/browser/moz.build b/toolkit/mozapps/webextensions/test/browser/moz.build similarity index 100% rename from toolkit/mozapps/extensions/test/browser/moz.build rename to toolkit/mozapps/webextensions/test/browser/moz.build diff --git a/toolkit/mozapps/extensions/test/browser/options.xul b/toolkit/mozapps/webextensions/test/browser/options.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/options.xul rename to toolkit/mozapps/webextensions/test/browser/options.xul diff --git a/toolkit/mozapps/extensions/test/browser/plugin_test.html b/toolkit/mozapps/webextensions/test/browser/plugin_test.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/plugin_test.html rename to toolkit/mozapps/webextensions/test/browser/plugin_test.html diff --git a/toolkit/mozapps/extensions/test/browser/redirect.sjs b/toolkit/mozapps/webextensions/test/browser/redirect.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/browser/redirect.sjs rename to toolkit/mozapps/webextensions/test/browser/redirect.sjs diff --git a/toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml b/toolkit/mozapps/webextensions/test/browser/releaseNotes.xhtml similarity index 100% rename from toolkit/mozapps/extensions/test/browser/releaseNotes.xhtml rename to toolkit/mozapps/webextensions/test/browser/releaseNotes.xhtml diff --git a/toolkit/mozapps/extensions/test/browser/signed_hotfix.rdf b/toolkit/mozapps/webextensions/test/browser/signed_hotfix.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/signed_hotfix.rdf rename to toolkit/mozapps/webextensions/test/browser/signed_hotfix.rdf diff --git a/toolkit/mozapps/extensions/test/browser/signed_hotfix.xpi b/toolkit/mozapps/webextensions/test/browser/signed_hotfix.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/signed_hotfix.xpi rename to toolkit/mozapps/webextensions/test/browser/signed_hotfix.xpi diff --git a/toolkit/mozapps/extensions/test/browser/unsigned_hotfix.rdf b/toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/browser/unsigned_hotfix.rdf rename to toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.rdf diff --git a/toolkit/mozapps/extensions/test/browser/unsigned_hotfix.xpi b/toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/browser/unsigned_hotfix.xpi rename to toolkit/mozapps/webextensions/test/browser/unsigned_hotfix.xpi diff --git a/toolkit/mozapps/extensions/test/browser/webapi_addon_listener.html b/toolkit/mozapps/webextensions/test/browser/webapi_addon_listener.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/webapi_addon_listener.html rename to toolkit/mozapps/webextensions/test/browser/webapi_addon_listener.html diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checkavailable.html b/toolkit/mozapps/webextensions/test/browser/webapi_checkavailable.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/webapi_checkavailable.html rename to toolkit/mozapps/webextensions/test/browser/webapi_checkavailable.html diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checkchromeframe.xul b/toolkit/mozapps/webextensions/test/browser/webapi_checkchromeframe.xul similarity index 100% rename from toolkit/mozapps/extensions/test/browser/webapi_checkchromeframe.xul rename to toolkit/mozapps/webextensions/test/browser/webapi_checkchromeframe.xul diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checkframed.html b/toolkit/mozapps/webextensions/test/browser/webapi_checkframed.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/webapi_checkframed.html rename to toolkit/mozapps/webextensions/test/browser/webapi_checkframed.html diff --git a/toolkit/mozapps/extensions/test/browser/webapi_checknavigatedwindow.html b/toolkit/mozapps/webextensions/test/browser/webapi_checknavigatedwindow.html similarity index 100% rename from toolkit/mozapps/extensions/test/browser/webapi_checknavigatedwindow.html rename to toolkit/mozapps/webextensions/test/browser/webapi_checknavigatedwindow.html diff --git a/toolkit/mozapps/extensions/test/mochitest/.eslintrc.js b/toolkit/mozapps/webextensions/test/mochitest/.eslintrc.js similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/.eslintrc.js rename to toolkit/mozapps/webextensions/test/mochitest/.eslintrc.js diff --git a/toolkit/mozapps/extensions/test/mochitest/file_bug687194.xpi b/toolkit/mozapps/webextensions/test/mochitest/file_bug687194.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/file_bug687194.xpi rename to toolkit/mozapps/webextensions/test/mochitest/file_bug687194.xpi diff --git a/toolkit/mozapps/extensions/test/mochitest/file_empty.html b/toolkit/mozapps/webextensions/test/mochitest/file_empty.html similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/file_empty.html rename to toolkit/mozapps/webextensions/test/mochitest/file_empty.html diff --git a/toolkit/mozapps/extensions/test/mochitest/mochitest.ini b/toolkit/mozapps/webextensions/test/mochitest/mochitest.ini similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/mochitest.ini rename to toolkit/mozapps/webextensions/test/mochitest/mochitest.ini diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug609794.html b/toolkit/mozapps/webextensions/test/mochitest/test_bug609794.html similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/test_bug609794.html rename to toolkit/mozapps/webextensions/test/mochitest/test_bug609794.html diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug687194.html b/toolkit/mozapps/webextensions/test/mochitest/test_bug687194.html similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/test_bug687194.html rename to toolkit/mozapps/webextensions/test/mochitest/test_bug687194.html diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html b/toolkit/mozapps/webextensions/test/mochitest/test_bug887098.html similarity index 100% rename from toolkit/mozapps/extensions/test/mochitest/test_bug887098.html rename to toolkit/mozapps/webextensions/test/mochitest/test_bug887098.html diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/webextensions/test/moz.build similarity index 100% rename from toolkit/mozapps/extensions/test/moz.build rename to toolkit/mozapps/webextensions/test/moz.build diff --git a/toolkit/mozapps/extensions/test/xpcshell/.eslintrc.js b/toolkit/mozapps/webextensions/test/xpcshell/.eslintrc.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/.eslintrc.js rename to toolkit/mozapps/webextensions/test/xpcshell/.eslintrc.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/BootstrapMonitor.jsm b/toolkit/mozapps/webextensions/test/xpcshell/data/BootstrapMonitor.jsm similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/BootstrapMonitor.jsm rename to toolkit/mozapps/webextensions/test/xpcshell/data/BootstrapMonitor.jsm diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_change.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_change.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_change.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update1.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update1.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update1.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update2.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update2.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update2.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update3.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/addon_update3.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/addon_update3.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/app_update.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/app_update.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/app_update.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/blocklist_update2.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/manual_update.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/blocklistchange/manual_update.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/blocklistchange/manual_update.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_block.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_block.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_empty.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/bug455906_empty.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_empty.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_start.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_start.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/bug455906_start.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_start.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_warn.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_warn.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/bug455906_warn.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/bug455906_warn.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/corrupt.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/corrupt.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/corrupt.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/corrupt.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/corruptfile.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/corruptfile.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/corruptfile.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/corruptfile.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/empty.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/empty.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/empty.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/empty.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/from_sources/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/from_sources/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/from_sources/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/from_sources/install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/from_sources/install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/pluginInfoURL_block.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/pluginInfoURL_block.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/pluginInfoURL_block.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/pluginInfoURL_block.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad2.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/bad2.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/bad2.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/empty.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/empty.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/empty.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/good.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/good.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/good.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/good.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/missing.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/missing.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/missing.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/missing.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/productaddons/unsigned.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/unsigned.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/productaddons/unsigned.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/productaddons/unsigned.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_1/test.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/bootstrap_2/test.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_badid.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_broken.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_good.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_good.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/hotfix_good.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/hotfix_good.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_hash.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_hash.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_hash.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_hash.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_plain.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_plain.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_63_plain.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_63_plain.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_hash.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_hash.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_hash.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_hash.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_plain.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_plain.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_64_plain.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_64_plain.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_65_hash.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_65_hash.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/long_65_hash.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/long_65_hash.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_badid.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_badid.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_badid.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_badid.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_broken.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_broken.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_broken.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_broken.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_signed.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_signed.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_signed.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_signed.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/multi_unsigned.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_1/test.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/nonbootstrap_2/test.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/preliminary_bootstrap_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_bootstrap_badid_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/signed_nonbootstrap_badid_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_bootstrap_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/signing_checks/unsigned_nonbootstrap_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system1_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_3.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_3.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_3.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system2_3.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_3.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_3.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_3.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system3_3.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system4_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system4_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system4_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system4_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system5_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system5_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system5_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system5_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_1_unpack.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_2_notBootstrap.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system6_3_notMultiprocess.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_complete_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_defer_also_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_delay_ignore_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_failed_update.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_failed_update.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system_failed_update.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/system_addons/system_failed_update.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_cache.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_cache.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_cache.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_ignore.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_normal.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_compatmode_strict.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_empty.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_empty.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_empty.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_failed.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_failed.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_failed.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_failed.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_AddonRepository_getAddonsByIDs.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_backgroundupdate.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_backgroundupdate.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_backgroundupdate.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_backgroundupdate.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_metadata_filters_1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_prefs_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_prefs_1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_prefs_1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_prefs_1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_regexp_1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_blocklist_regexp_1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_blocklist_regexp_1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716_2.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug299716_2.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug299716_2.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug324121.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug324121.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug324121.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug324121.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug393285.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug393285.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug393285.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug393285.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug394300.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug394300.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug394300.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug394300.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug424262.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug424262.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug424262.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_app.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_app.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_app.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_app.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_toolkit.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_toolkit.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug449027_toolkit.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug449027_toolkit.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug468528.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug468528.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug468528.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug468528.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_1.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_1.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_1.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_2.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_2.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_2.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_3.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_3.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_3.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_4.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_4.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_4.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_4.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_5.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_5.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/install_5.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/install_5.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_1.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_1.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_1.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_2.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_2.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_2.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_3.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_3.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_3.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_4.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_4.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_4.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_4.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_5.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_5.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug470377/update_5.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug470377/update_5.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_2.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_2.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_2.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_empty.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_empty.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_empty.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_empty.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug514327_3_outdated_2.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_1.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_1.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_1.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_1.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_2.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug526598_2.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug526598_2.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug541420.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug541420.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug541420.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug541420.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug542391.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug542391.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug542391.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug542391.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug554133.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug554133.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug554133.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug554133.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug619730.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug619730.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug619730.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug619730.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_bug655254.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_bug655254.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_bug655254.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_bug655254.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_compatoverrides.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_compatoverrides.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_compatoverrides.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_compatoverrides.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_corrupt.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_corrupt.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_corrupt.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_corrupt.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_complete/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_defer/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_update_ignore/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.json similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.json rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.json diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_complete.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_complete.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.json similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.json rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.json diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_defer.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_defer.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.json similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.json rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.json diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_delay_updates_ignore.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_delay_updates_ignore.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_dictionary.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_dictionary.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_dictionary.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_dictionary.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/dummy.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt b/toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_distribution2_2/subdir/subdir2/dummy2.txt diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist2.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist2.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml old mode 100755 new mode 100644 similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_1.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_1.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_1.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_1.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_2.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_2.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_2.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_2.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_3.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_3.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_hotfix_3.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_hotfix_3.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_install.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_install.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_install.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_install.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_install.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_install.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_install.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_install.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_migrate.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_migrate.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_migrate4.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate4.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_migrate4.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_migrate4.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_no_update.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_no_update.json similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_no_update.json rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_no_update.json diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/ancient.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/ancient.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/ancient.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/ancient.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/new.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/new.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/new.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/new.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/old.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/old.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_overrideblocklist/old.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_overrideblocklist/old.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtp.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtp.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtp.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtp.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_pluginBlocklistCtpUndo.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_proxy/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_proxy/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_proxy/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_proxy/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_softblocked1.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_softblocked1.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_softblocked1.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_softblocked1.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_sourceURI.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_sourceURI.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_sourceURI.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_sourceURI.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_temporary/bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/data/test_temporary/bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_temporary/bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_temporary/bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.json similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_update.json rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_update.json diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_update.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_update.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update.xml b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update.xml similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_update.xml rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_update.xml diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_update_multi.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_update_multi.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_update_multi.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_update_multi.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.json b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.json similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.json rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.json diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_updatecheck.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecheck.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_ignore.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_normal.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_normal.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_normal.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_normal.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_strict.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_strict.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_updatecompatmode_strict.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_updatecompatmode_strict.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/test_updateid.rdf b/toolkit/mozapps/webextensions/test/xpcshell/data/test_updateid.rdf similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/test_updateid.rdf rename to toolkit/mozapps/webextensions/test/xpcshell/data/test_updateid.rdf diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/unsigned.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/unsigned.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/unsigned.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/unsigned.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/webext-implicit-id.xpi b/toolkit/mozapps/webextensions/test/xpcshell/data/webext-implicit-id.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/data/webext-implicit-id.xpi rename to toolkit/mozapps/webextensions/test/xpcshell/data/webext-implicit-id.xpi diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/head_addons.js rename to toolkit/mozapps/webextensions/test/xpcshell/head_addons.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js b/toolkit/mozapps/webextensions/test/xpcshell/head_unpack.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/head_unpack.js rename to toolkit/mozapps/webextensions/test/xpcshell/head_unpack.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_cache.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_cache.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_compatmode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_compatmode.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_compatmode.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_AddonRepository_compatmode.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ChromeManifestParser.js b/toolkit/mozapps/webextensions/test/xpcshell/test_ChromeManifestParser.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_ChromeManifestParser.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_ChromeManifestParser.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js b/toolkit/mozapps/webextensions/test/xpcshell/test_DeferredSave.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_DeferredSave.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js b/toolkit/mozapps/webextensions/test/xpcshell/test_LightweightThemeManager.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_LightweightThemeManager.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_LightweightThemeManager.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js b/toolkit/mozapps/webextensions/test/xpcshell/test_ProductAddonChecker.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_ProductAddonChecker.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_XPIStates.js b/toolkit/mozapps/webextensions/test/xpcshell/test_XPIStates.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_XPIStates.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_XPIStates.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_XPIcancel.js b/toolkit/mozapps/webextensions/test/xpcshell/test_XPIcancel.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_XPIcancel.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_XPIcancel.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_addon_path_service.js b/toolkit/mozapps/webextensions/test/xpcshell/test_addon_path_service.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_addon_path_service.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_addon_path_service.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_asyncBlocklistLoad.js b/toolkit/mozapps/webextensions/test/xpcshell/test_asyncBlocklistLoad.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_asyncBlocklistLoad.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_asyncBlocklistLoad.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js b/toolkit/mozapps/webextensions/test/xpcshell/test_backgroundupdate.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_backgroundupdate.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bad_json.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bad_json.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bad_json.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bad_json.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_badschema.js b/toolkit/mozapps/webextensions/test/xpcshell/test_badschema.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_badschema.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_badschema.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_gfx.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_gfx.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_blocklist_gfx.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_gfx.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_metadata_filters.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_metadata_filters.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_prefs.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_prefs.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_regexp.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_blocklist_regexp.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js b/toolkit/mozapps/webextensions/test/xpcshell/test_blocklistchange.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_blocklistchange.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_const.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_const.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_const.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_const.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_globals.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_globals.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_globals.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_globals.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_resource.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_resource.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bootstrap_resource.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bootstrap_resource.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug1180901.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901_2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug1180901_2.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug1180901_2.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug299716.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug299716.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug299716.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug299716_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug299716_2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug299716_2.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug299716_2.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug324121.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug324121.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug324121.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug324121.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug335238.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug335238.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug335238.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug371495.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug371495.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug371495.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug371495.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug384052.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug384052.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug384052.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug384052.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug393285.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug393285.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug394300.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug394300.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug394300.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug394300.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug397778.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug397778.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug406118.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug406118.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug424262.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug424262.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug424262.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug425657.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug425657.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug430120.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug430120.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug430120.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug430120.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug449027.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug449027.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug449027.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug455906.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug455906.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug465190.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug465190.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug465190.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug465190.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug468528.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug468528.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug470377_1_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_1_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_2.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_3_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug470377_4.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_1.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_1.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug514327_1.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_1.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_2.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug514327_3.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug514327_3.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug521905.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug521905.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug526598.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug526598.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug526598.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug526598.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug541420.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug541420.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug542391.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug542391.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug542391.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug542391.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug554133.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug554133.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug554133.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug554133.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug559800.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug559800.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug559800.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug563256.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug563256.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug564030.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug564030.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug564030.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug564030.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug566626.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug566626.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug566626.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug566626.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug567184.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug567184.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug567184.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug567184.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug569138.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug569138.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug569138.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug569138.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug570173.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug570173.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug576735.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug576735.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug576735.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug576735.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug587088.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug587088.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug587088.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug587088.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug594058.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug594058.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug595081.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug595081.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug595573.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595573.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug595573.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug595573.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug596607.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug596607.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug596607.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug596607.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug616841.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug616841.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug616841.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug616841.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug619730.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug619730.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug619730.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug619730.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug620837.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug620837.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug620837.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug620837.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug655254.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug655254.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug659772.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug659772.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug659772.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug659772.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug675371.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug675371.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug740612.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug740612.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug753900.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug753900.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug753900.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug753900.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug757663.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug757663.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug757663.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug953156.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_bug953156.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_bug953156.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_cache_certdb.js b/toolkit/mozapps/webextensions/test/xpcshell/test_cache_certdb.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_cache_certdb.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_cache_certdb.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_cacheflush.js b/toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_cacheflush.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_checkCompatibility_themeOverride.js b/toolkit/mozapps/webextensions/test/xpcshell/test_checkCompatibility_themeOverride.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_checkCompatibility_themeOverride.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_checkCompatibility_themeOverride.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js b/toolkit/mozapps/webextensions/test/xpcshell/test_checkcompatibility.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_checkcompatibility.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js b/toolkit/mozapps/webextensions/test/xpcshell/test_childprocess.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_childprocess.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_compatoverrides.js b/toolkit/mozapps/webextensions/test/xpcshell/test_compatoverrides.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_compatoverrides.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_compatoverrides.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js b/toolkit/mozapps/webextensions/test/xpcshell/test_corrupt.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_corrupt.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_corrupt.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corrupt_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_corrupt_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_corrupt_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_corrupt_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_corruptfile.js b/toolkit/mozapps/webextensions/test/xpcshell/test_corruptfile.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_corruptfile.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_corruptfile.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dataDirectory.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dataDirectory.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_dataDirectory.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_dataDirectory.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_default_providers_pref.js b/toolkit/mozapps/webextensions/test/xpcshell/test_default_providers_pref.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_default_providers_pref.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_default_providers_pref.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_delay_update.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_delay_update.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_delay_update.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js b/toolkit/mozapps/webextensions/test/xpcshell/test_delay_update_webextension.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_delay_update_webextension.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dependencies.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dependencies.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_dependencies.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_dependencies.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dictionary.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_dictionary.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_disable.js b/toolkit/mozapps/webextensions/test/xpcshell/test_disable.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_disable.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_disable.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_distribution.js b/toolkit/mozapps/webextensions/test/xpcshell/test_distribution.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_distribution.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_distribution.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dss.js b/toolkit/mozapps/webextensions/test/xpcshell/test_dss.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_dss.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_dss.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js b/toolkit/mozapps/webextensions/test/xpcshell/test_duplicateplugins.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_duplicateplugins.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js b/toolkit/mozapps/webextensions/test/xpcshell/test_e10s_restartless.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_e10s_restartless.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_e10s_restartless.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_error.js b/toolkit/mozapps/webextensions/test/xpcshell/test_error.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_error.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_error.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_experiment.js b/toolkit/mozapps/webextensions/test/xpcshell/test_experiment.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_experiment.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_experiment.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ext_management.js b/toolkit/mozapps/webextensions/test/xpcshell/test_ext_management.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_ext_management.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_ext_management.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_filepointer.js b/toolkit/mozapps/webextensions/test/xpcshell/test_filepointer.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_filepointer.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_filepointer.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js b/toolkit/mozapps/webextensions/test/xpcshell/test_fuel.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_fuel.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_fuel.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_general.js b/toolkit/mozapps/webextensions/test/xpcshell/test_general.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_general.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_general.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_getresource.js b/toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_getresource.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Device.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Device.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Device.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_DriverNew.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_DriverNew.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_DriverNew.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_DriverNew.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverNew.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_DriverOld.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Equal_OK.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_DriverOld.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_GTE_OK.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_No_Comparison.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OK.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OK.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OK.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OS.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OS.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OS.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OS.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_match.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_DriverVersion.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_OSVersion_mismatch_OSVersion.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Vendor.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Vendor.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Vendor.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Vendor.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Version.js old mode 100755 new mode 100644 similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_Version.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_Version.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_prefs.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gfxBlacklist_prefs.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js b/toolkit/mozapps/webextensions/test/xpcshell/test_gmpProvider.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_gmpProvider.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_hasbinarycomponents.js b/toolkit/mozapps/webextensions/test/xpcshell/test_hasbinarycomponents.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_hasbinarycomponents.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_hasbinarycomponents.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_hotfix.js b/toolkit/mozapps/webextensions/test/xpcshell/test_hotfix.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_hotfix.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_hotfix.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_hotfix_cert.js b/toolkit/mozapps/webextensions/test/xpcshell/test_hotfix_cert.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_hotfix_cert.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_hotfix_cert.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_install.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_install.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install_from_sources.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install_from_sources.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_install_from_sources.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_install_from_sources.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install_icons.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install_icons.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_install_icons.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_install_icons.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_install_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_install_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_install_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_isDebuggable.js b/toolkit/mozapps/webextensions/test/xpcshell/test_isDebuggable.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_isDebuggable.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_isDebuggable.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_isReady.js b/toolkit/mozapps/webextensions/test/xpcshell/test_isReady.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_isReady.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_isReady.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_json_updatecheck.js b/toolkit/mozapps/webextensions/test/xpcshell/test_json_updatecheck.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_json_updatecheck.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_json_updatecheck.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js b/toolkit/mozapps/webextensions/test/xpcshell/test_langpack.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_langpack.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_langpack.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locale.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locale.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_locale.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_locale.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locked.js old mode 100755 new mode 100644 similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_locked.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_locked.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locked2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_locked2.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_locked2.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_locked_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_locked_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_manifest.js b/toolkit/mozapps/webextensions/test/xpcshell/test_manifest.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_manifest.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_manifest.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js b/toolkit/mozapps/webextensions/test/xpcshell/test_mapURIToAddonID.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_mapURIToAddonID.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_metadata_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_metadata_update.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_metadata_update.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_metadata_update.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate1.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate1.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrate1.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrate1.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate2.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrate2.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrate2.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate3.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrate3.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrate3.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate4.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrate4.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrate4.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate5.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate5.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrate5.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrate5.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrateAddonRepository.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrateAddonRepository.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrateAddonRepository.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrateAddonRepository.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_migrate_max_version.js b/toolkit/mozapps/webextensions/test/xpcshell/test_migrate_max_version.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_migrate_max_version.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_migrate_max_version.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_multiprocessCompatible.js b/toolkit/mozapps/webextensions/test/xpcshell/test_multiprocessCompatible.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_multiprocessCompatible.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_multiprocessCompatible.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js b/toolkit/mozapps/webextensions/test/xpcshell/test_no_addons.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_no_addons.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_nodisable_hidden.js b/toolkit/mozapps/webextensions/test/xpcshell/test_nodisable_hidden.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_nodisable_hidden.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_nodisable_hidden.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_onPropertyChanged_appDisabled.js b/toolkit/mozapps/webextensions/test/xpcshell/test_onPropertyChanged_appDisabled.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_onPropertyChanged_appDisabled.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_onPropertyChanged_appDisabled.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_overrideblocklist.js b/toolkit/mozapps/webextensions/test/xpcshell/test_overrideblocklist.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_overrideblocklist.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_overrideblocklist.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pass_symbol.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pass_symbol.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_pass_symbol.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_pass_symbol.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_permissions.js b/toolkit/mozapps/webextensions/test/xpcshell/test_permissions.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_permissions.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_permissions.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js b/toolkit/mozapps/webextensions/test/xpcshell/test_permissions_prefs.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_permissions_prefs.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginBlocklistCtp.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginBlocklistCtp.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_pluginBlocklistCtp.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_pluginBlocklistCtp.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginInfoURL.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginInfoURL.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_pluginInfoURL.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_pluginInfoURL.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pluginchange.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_pluginchange.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js b/toolkit/mozapps/webextensions/test/xpcshell/test_plugins.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_plugins.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_plugins.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js b/toolkit/mozapps/webextensions/test/xpcshell/test_pref_properties.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_pref_properties.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_markSafe.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_markSafe.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_provider_markSafe.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_provider_markSafe.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_shutdown.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_shutdown.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_provider_shutdown.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_provider_shutdown.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_shutdown.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_shutdown.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js b/toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_startup.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_provider_unsafe_access_startup.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_proxies.js b/toolkit/mozapps/webextensions/test/xpcshell/test_proxies.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_proxies.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_proxies.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_proxy.js b/toolkit/mozapps/webextensions/test/xpcshell/test_proxy.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_proxy.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_proxy.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_registry.js b/toolkit/mozapps/webextensions/test/xpcshell/test_registry.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_registry.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_registry.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_reload.js b/toolkit/mozapps/webextensions/test/xpcshell/test_reload.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_reload.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_reload.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_safemode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_safemode.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_schema_change.js b/toolkit/mozapps/webextensions/test/xpcshell/test_schema_change.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_schema_change.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_schema_change.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_seen.js b/toolkit/mozapps/webextensions/test/xpcshell/test_seen.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_seen.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_seen.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_seen_newprofile.js b/toolkit/mozapps/webextensions/test/xpcshell/test_seen_newprofile.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_seen_newprofile.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_seen_newprofile.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js b/toolkit/mozapps/webextensions/test/xpcshell/test_shutdown.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_shutdown.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_inject.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_inject.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_inject.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_install.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_install.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_install.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_install.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_long.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_long.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_long.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_long.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_migrate.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_migrate.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_migrate.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_migrate.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_multi.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_multi.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_multi.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_multi.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_updatepref.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_updatepref.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_updatepref.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_updatepref.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js b/toolkit/mozapps/webextensions/test/xpcshell/test_signed_verify.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_signed_verify.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js b/toolkit/mozapps/webextensions/test/xpcshell/test_softblocked.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_softblocked.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_sourceURI.js b/toolkit/mozapps/webextensions/test/xpcshell/test_sourceURI.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_sourceURI.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_sourceURI.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js b/toolkit/mozapps/webextensions/test/xpcshell/test_startup.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_startup.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_startup.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_strictcompatibility.js b/toolkit/mozapps/webextensions/test/xpcshell/test_strictcompatibility.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_strictcompatibility.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_strictcompatibility.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_switch_os.js b/toolkit/mozapps/webextensions/test/xpcshell/test_switch_os.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_switch_os.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_switch_os.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_syncGUID.js b/toolkit/mozapps/webextensions/test/xpcshell/test_syncGUID.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_syncGUID.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_syncGUID.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_system_delay_update.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_system_delay_update.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_reset.js b/toolkit/mozapps/webextensions/test/xpcshell/test_system_reset.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_system_reset.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_system_reset.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_system_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_system_update.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_system_update.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_system_update.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_targetPlatforms.js b/toolkit/mozapps/webextensions/test/xpcshell/test_targetPlatforms.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_targetPlatforms.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_targetPlatforms.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_temporary.js b/toolkit/mozapps/webextensions/test/xpcshell/test_temporary.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_temporary.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_temporary.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_theme.js b/toolkit/mozapps/webextensions/test/xpcshell/test_theme.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_theme.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_theme.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_types.js b/toolkit/mozapps/webextensions/test/xpcshell/test_types.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_types.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_types.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js b/toolkit/mozapps/webextensions/test/xpcshell/test_undothemeuninstall.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_undothemeuninstall.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js b/toolkit/mozapps/webextensions/test/xpcshell/test_undouninstall.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_undouninstall.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_uninstall.js b/toolkit/mozapps/webextensions/test/xpcshell/test_uninstall.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_uninstall.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_uninstall.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_update.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_update.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js b/toolkit/mozapps/webextensions/test/xpcshell/test_updateCancel.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_updateCancel.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_compatmode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_compatmode.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_update_compatmode.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_update_compatmode.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_ignorecompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_ignorecompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_update_ignorecompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_update_ignorecompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_update_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_update_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_update_webextensions.js b/toolkit/mozapps/webextensions/test/xpcshell/test_update_webextensions.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_update_webextensions.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_update_webextensions.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js b/toolkit/mozapps/webextensions/test/xpcshell/test_updatecheck.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_updatecheck.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updateid.js b/toolkit/mozapps/webextensions/test/xpcshell/test_updateid.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_updateid.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_updateid.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_upgrade.js b/toolkit/mozapps/webextensions/test/xpcshell/test_upgrade.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_upgrade.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_upgrade.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_upgrade_strictcompat.js b/toolkit/mozapps/webextensions/test/xpcshell/test_upgrade_strictcompat.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_upgrade_strictcompat.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_upgrade_strictcompat.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_webextension.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_webextension.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_embedded.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_embedded.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_webextension_embedded.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_webextension_embedded.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_icons.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_webextension_icons.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_install.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_webextension_install.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_paths.js b/toolkit/mozapps/webextensions/test/xpcshell/test_webextension_paths.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/test_webextension_paths.js rename to toolkit/mozapps/webextensions/test/xpcshell/test_webextension_paths.js diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell-shared.ini similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini rename to toolkit/mozapps/webextensions/test/xpcshell/xpcshell-shared.ini diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell-unpack.ini similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini rename to toolkit/mozapps/webextensions/test/xpcshell/xpcshell-unpack.ini diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/webextensions/test/xpcshell/xpcshell.ini similarity index 100% rename from toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini rename to toolkit/mozapps/webextensions/test/xpcshell/xpcshell.ini diff --git a/toolkit/mozapps/extensions/test/xpinstall/.eslintrc.js b/toolkit/mozapps/webextensions/test/xpinstall/.eslintrc.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/.eslintrc.js rename to toolkit/mozapps/webextensions/test/xpinstall/.eslintrc.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi b/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/amosigned2.xpi b/toolkit/mozapps/webextensions/test/xpinstall/amosigned2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/amosigned2.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/amosigned2.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/authRedirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/authRedirect.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/authRedirect.sjs rename to toolkit/mozapps/webextensions/test/xpinstall/authRedirect.sjs diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser.ini b/toolkit/mozapps/webextensions/test/xpinstall/browser.ini similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser.ini rename to toolkit/mozapps/webextensions/test/xpinstall/browser.ini diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger_iframe.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger_iframe.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger_iframe.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_trigger_iframe.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_url.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_amosigned_url.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_auth.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_auth.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_auth2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_auth2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_auth3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_auth4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_auth4.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badargs.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_badargs.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badargs2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_badargs2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_badargs2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badhash.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badhash.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_badhash.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_badhash.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_badhashtype.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badhashtype.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_badhashtype.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_badhashtype.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug540558.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug540558.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_bug540558.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_bug540558.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug611242.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_bug611242.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_bug611242.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug638292.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_bug638292.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug645699.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug645699.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_bug645699.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_bug645699.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug672485.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_bug672485.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cancel.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_cancel.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_cancel.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_concurrent_installs.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_concurrent_installs.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_cookies.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_cookies.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_cookies2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_cookies2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_cookies3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_cookies3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_cookies4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_cookies4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_cookies4.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_cookies4.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_corrupt.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_corrupt.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_corrupt.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_corrupt.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_datauri.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_datauri.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_empty.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_empty.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_empty.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_empty.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_enabled.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_enabled2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_enabled3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_enabled3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_hash.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_hash.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_hash.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_hash.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_hash2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_hash2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_hash2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_httphash.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_httphash.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_httphash2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_httphash2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_httphash3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_httphash3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_httphash4.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_httphash4.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash5.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash5.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_httphash5.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_httphash5.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_httphash6.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_httphash6.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_httphash6.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_httphash6.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_installchrome.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_installchrome.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_installchrome.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_installchrome.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_localfile.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_localfile2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_localfile3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_localfile4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_localfile4.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_multipackage.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_multipackage.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_multipackage.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_navigateaway4.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_navigateaway4.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_offline.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_offline.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_offline.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_offline.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_relative.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_relative.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_relative.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_relative.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multipackage.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multipackage.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_multipackage.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multipackage.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multiple.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_multiple.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_multiple.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_naming.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_naming.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_naming.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_tampered.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_tampered.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_tampered.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_tampered.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_trigger.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_trigger.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_trigger.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_trigger.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_untrusted.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_untrusted.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_untrusted.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_untrusted.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_signed_url.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_signed_url.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_signed_url.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_signed_url.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_softwareupdate.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_softwareupdate.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_softwareupdate.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_softwareupdate.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_switchtab.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_switchtab.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_switchtab.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_switchtab.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_trigger_redirect.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_trigger_redirect.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_trigger_redirect.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_trigger_redirect.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_iframe.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_iframe.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_iframe.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_iframe.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_xorigin.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_xorigin.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_trigger_xorigin.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_trigger_xorigin.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_url.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_url.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_unsigned_url.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_unsigned_url.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist2.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist2.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist2.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist3.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist3.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist4.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist4.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist5.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist5.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist5.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist5.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist6.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist6.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist6.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist6.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist7.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist7.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/browser_whitelist7.js rename to toolkit/mozapps/webextensions/test/xpinstall/browser_whitelist7.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug540558.html b/toolkit/mozapps/webextensions/test/xpinstall/bug540558.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/bug540558.html rename to toolkit/mozapps/webextensions/test/xpinstall/bug540558.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug638292.html b/toolkit/mozapps/webextensions/test/xpinstall/bug638292.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/bug638292.html rename to toolkit/mozapps/webextensions/test/xpinstall/bug638292.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html b/toolkit/mozapps/webextensions/test/xpinstall/bug645699.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/bug645699.html rename to toolkit/mozapps/webextensions/test/xpinstall/bug645699.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html b/toolkit/mozapps/webextensions/test/xpinstall/concurrent_installs.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html rename to toolkit/mozapps/webextensions/test/xpinstall/concurrent_installs.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/cookieRedirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/cookieRedirect.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/cookieRedirect.sjs rename to toolkit/mozapps/webextensions/test/xpinstall/cookieRedirect.sjs diff --git a/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi b/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/empty.xpi b/toolkit/mozapps/webextensions/test/xpinstall/empty.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/empty.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/empty.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/enabled.html b/toolkit/mozapps/webextensions/test/xpinstall/enabled.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/enabled.html rename to toolkit/mozapps/webextensions/test/xpinstall/enabled.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/hashRedirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/hashRedirect.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/hashRedirect.sjs rename to toolkit/mozapps/webextensions/test/xpinstall/hashRedirect.sjs diff --git a/toolkit/mozapps/extensions/test/xpinstall/head.js b/toolkit/mozapps/webextensions/test/xpinstall/head.js similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/head.js rename to toolkit/mozapps/webextensions/test/xpinstall/head.js diff --git a/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi b/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/installchrome.html b/toolkit/mozapps/webextensions/test/xpinstall/installchrome.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/installchrome.html rename to toolkit/mozapps/webextensions/test/xpinstall/installchrome.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html b/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/installtrigger.html rename to toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html b/toolkit/mozapps/webextensions/test/xpinstall/installtrigger_frame.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/installtrigger_frame.html rename to toolkit/mozapps/webextensions/test/xpinstall/installtrigger_frame.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/multipackage.xpi b/toolkit/mozapps/webextensions/test/xpinstall/multipackage.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/multipackage.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/multipackage.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/navigate.html b/toolkit/mozapps/webextensions/test/xpinstall/navigate.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/navigate.html rename to toolkit/mozapps/webextensions/test/xpinstall/navigate.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/redirect.sjs b/toolkit/mozapps/webextensions/test/xpinstall/redirect.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/redirect.sjs rename to toolkit/mozapps/webextensions/test/xpinstall/redirect.sjs diff --git a/toolkit/mozapps/extensions/test/xpinstall/restartless-unsigned.xpi b/toolkit/mozapps/webextensions/test/xpinstall/restartless-unsigned.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/restartless-unsigned.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/restartless-unsigned.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi b/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/restartless.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-multipackage.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-multipackage.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed-multipackage.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed-multipackage.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-no-cn.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-no-cn.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed-no-cn.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed-no-cn.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-no-o.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-no-o.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed-no-o.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed-no-o.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-tampered.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-tampered.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed-tampered.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed-tampered.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed-untrusted.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed-untrusted.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed-untrusted.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed-untrusted.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/signed2.xpi b/toolkit/mozapps/webextensions/test/xpinstall/signed2.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/signed2.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/signed2.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs b/toolkit/mozapps/webextensions/test/xpinstall/slowinstall.sjs similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/slowinstall.sjs rename to toolkit/mozapps/webextensions/test/xpinstall/slowinstall.sjs diff --git a/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html b/toolkit/mozapps/webextensions/test/xpinstall/startsoftwareupdate.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html rename to toolkit/mozapps/webextensions/test/xpinstall/startsoftwareupdate.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/theme.xpi b/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/theme.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/theme.xpi diff --git a/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html b/toolkit/mozapps/webextensions/test/xpinstall/triggerredirect.html similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html rename to toolkit/mozapps/webextensions/test/xpinstall/triggerredirect.html diff --git a/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi b/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi similarity index 100% rename from toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi rename to toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn index 8d1c12305..0965662bd 100644 --- a/toolkit/themes/linux/mozapps/jar.mn +++ b/toolkit/themes/linux/mozapps/jar.mn @@ -6,21 +6,23 @@ toolkit.jar: #include ../../shared/mozapps.inc.mn skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) -* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) - skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) - skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) - skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) - skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) - skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) - skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) - skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) - skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) - skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) - skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) - skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) - skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) -* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) - skin/classic/mozapps/extensions/heart.png (extensions/heart.png) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) +#endif skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) diff --git a/toolkit/themes/linux/mozapps/extensions/category-available.png b/toolkit/themes/linux/mozapps/webextensions/category-available.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/category-available.png rename to toolkit/themes/linux/mozapps/webextensions/category-available.png diff --git a/toolkit/themes/linux/mozapps/extensions/category-discover.png b/toolkit/themes/linux/mozapps/webextensions/category-discover.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/category-discover.png rename to toolkit/themes/linux/mozapps/webextensions/category-discover.png diff --git a/toolkit/themes/linux/mozapps/extensions/category-plugins.png b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/category-plugins.png rename to toolkit/themes/linux/mozapps/webextensions/category-plugins.png diff --git a/toolkit/themes/linux/mozapps/extensions/category-recent.png b/toolkit/themes/linux/mozapps/webextensions/category-recent.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/category-recent.png rename to toolkit/themes/linux/mozapps/webextensions/category-recent.png diff --git a/toolkit/themes/linux/mozapps/extensions/category-search.png b/toolkit/themes/linux/mozapps/webextensions/category-search.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/category-search.png rename to toolkit/themes/linux/mozapps/webextensions/category-search.png diff --git a/toolkit/themes/linux/mozapps/extensions/category-service.png b/toolkit/themes/linux/mozapps/webextensions/category-service.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/category-service.png rename to toolkit/themes/linux/mozapps/webextensions/category-service.png diff --git a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/dictionaryGeneric-16.png rename to toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png diff --git a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/dictionaryGeneric.png rename to toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png diff --git a/toolkit/themes/linux/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/extensionGeneric-16.png rename to toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/webextensions/extensions.css similarity index 95% rename from toolkit/themes/linux/mozapps/extensions/extensions.css rename to toolkit/themes/linux/mozapps/webextensions/extensions.css index a75669937..5a11df119 100644 --- a/toolkit/themes/linux/mozapps/extensions/extensions.css +++ b/toolkit/themes/linux/mozapps/webextensions/extensions.css @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../shared/extensions/extensions.inc.css +%include ../../../shared/webextensions/extensions.inc.css #header-utils-btn .toolbarbutton-icon { list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); diff --git a/toolkit/themes/linux/mozapps/extensions/heart.png b/toolkit/themes/linux/mozapps/webextensions/heart.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/heart.png rename to toolkit/themes/linux/mozapps/webextensions/heart.png diff --git a/toolkit/themes/linux/mozapps/extensions/localeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/localeGeneric.png rename to toolkit/themes/linux/mozapps/webextensions/localeGeneric.png diff --git a/toolkit/themes/windows/mozapps/extensions/newaddon.css b/toolkit/themes/linux/mozapps/webextensions/newaddon.css similarity index 78% rename from toolkit/themes/windows/mozapps/extensions/newaddon.css rename to toolkit/themes/linux/mozapps/webextensions/newaddon.css index edfba0ef5..5856c08b5 100644 --- a/toolkit/themes/windows/mozapps/extensions/newaddon.css +++ b/toolkit/themes/linux/mozapps/webextensions/newaddon.css @@ -2,4 +2,4 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../shared/extensions/newaddon.inc.css +%include ../../../shared/webextensions/newaddon.inc.css diff --git a/toolkit/themes/linux/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/themeGeneric-16.png rename to toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png diff --git a/toolkit/themes/linux/mozapps/extensions/themeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png similarity index 100% rename from toolkit/themes/linux/mozapps/extensions/themeGeneric.png rename to toolkit/themes/linux/mozapps/webextensions/themeGeneric.png diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index 3f5717073..8da83da16 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -8,34 +8,36 @@ toolkit.jar: skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) * skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) skin/classic/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css) - skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) - skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) - skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) - skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) - skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png) - skin/classic/mozapps/extensions/category-experiments.png (extensions/category-experiments.png) - skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) - skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) - skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) - skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) - skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) - skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) - skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) - skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) - skin/classic/mozapps/extensions/experimentGeneric.png (extensions/experimentGeneric.png) - skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) - skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) - skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) - skin/classic/mozapps/extensions/cancel.png (extensions/cancel.png) - skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (extensions/toolbarbutton-dropmarker.png) - skin/classic/mozapps/extensions/heart.png (extensions/heart.png) - skin/classic/mozapps/extensions/search.png (extensions/search.png) - skin/classic/mozapps/extensions/about.css (extensions/about.css) -* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) - skin/classic/mozapps/extensions/update.css (extensions/update.css) - skin/classic/mozapps/extensions/eula.css (extensions/eula.css) - skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) -* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-dictionaries.png (webextensions/category-dictionaries.png) + skin/classic/mozapps/extensions/category-experiments.png (webextensions/category-experiments.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/discover-logo.png (webextensions/discover-logo.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/experimentGeneric.png (webextensions/experimentGeneric.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (webextensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (webextensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (webextensions/cancel.png) + skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (webextensions/toolbarbutton-dropmarker.png) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) + skin/classic/mozapps/extensions/search.png (webextensions/search.png) + skin/classic/mozapps/extensions/about.css (webextensions/about.css) +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/update.css (webextensions/update.css) + skin/classic/mozapps/extensions/eula.css (webextensions/eula.css) + skin/classic/mozapps/extensions/blocklist.css (webextensions/blocklist.css) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) +#endif skin/classic/mozapps/plugins/notifyPluginGeneric.png (plugins/notifyPluginGeneric.png) skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) @@ -48,7 +50,9 @@ toolkit.jar: skin/classic/mozapps/update/buttons.png (update/buttons.png) * skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) - skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/xpinstall/xpinstallConfirm.css (webextensions/xpinstallConfirm.css) +#endif skin/classic/mozapps/handling/handling.css (handling/handling.css) #ifdef MOZ_PHOENIX @@ -56,7 +60,9 @@ toolkit.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif +#ifdef MOZ_WEBEXTENSIONS % override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg % override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png % override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png +#endif % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/notifyPluginGeneric.png diff --git a/toolkit/themes/osx/mozapps/extensions/about.css b/toolkit/themes/osx/mozapps/webextensions/about.css similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/about.css rename to toolkit/themes/osx/mozapps/webextensions/about.css diff --git a/toolkit/themes/osx/mozapps/extensions/blocklist.css b/toolkit/themes/osx/mozapps/webextensions/blocklist.css similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/blocklist.css rename to toolkit/themes/osx/mozapps/webextensions/blocklist.css diff --git a/toolkit/themes/osx/mozapps/extensions/cancel.png b/toolkit/themes/osx/mozapps/webextensions/cancel.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/cancel.png rename to toolkit/themes/osx/mozapps/webextensions/cancel.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-available.png b/toolkit/themes/osx/mozapps/webextensions/category-available.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-available.png rename to toolkit/themes/osx/mozapps/webextensions/category-available.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-dictionaries.png rename to toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-discover.png b/toolkit/themes/osx/mozapps/webextensions/category-discover.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-discover.png rename to toolkit/themes/osx/mozapps/webextensions/category-discover.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-experiments.png b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-experiments.png rename to toolkit/themes/osx/mozapps/webextensions/category-experiments.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-plugins.png b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-plugins.png rename to toolkit/themes/osx/mozapps/webextensions/category-plugins.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-recent.png b/toolkit/themes/osx/mozapps/webextensions/category-recent.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-recent.png rename to toolkit/themes/osx/mozapps/webextensions/category-recent.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-search.png b/toolkit/themes/osx/mozapps/webextensions/category-search.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-search.png rename to toolkit/themes/osx/mozapps/webextensions/category-search.png diff --git a/toolkit/themes/osx/mozapps/extensions/category-service.png b/toolkit/themes/osx/mozapps/webextensions/category-service.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/category-service.png rename to toolkit/themes/osx/mozapps/webextensions/category-service.png diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png rename to toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png rename to toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png diff --git a/toolkit/themes/osx/mozapps/extensions/discover-logo.png b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/discover-logo.png rename to toolkit/themes/osx/mozapps/webextensions/discover-logo.png diff --git a/toolkit/themes/osx/mozapps/extensions/eula.css b/toolkit/themes/osx/mozapps/webextensions/eula.css similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/eula.css rename to toolkit/themes/osx/mozapps/webextensions/eula.css diff --git a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/experimentGeneric.png rename to toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png diff --git a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png rename to toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/webextensions/extensions.css similarity index 95% rename from toolkit/themes/osx/mozapps/extensions/extensions.css rename to toolkit/themes/osx/mozapps/webextensions/extensions.css index d4dac2f01..cbdd9a5b0 100644 --- a/toolkit/themes/osx/mozapps/extensions/extensions.css +++ b/toolkit/themes/osx/mozapps/webextensions/extensions.css @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../shared/extensions/extensions.inc.css +%include ../../../shared/webextensions/extensions.inc.css .no-auto-hide > .menulist-dropmarker { padding-inline-start: 0px !important; diff --git a/toolkit/themes/osx/mozapps/extensions/heart.png b/toolkit/themes/osx/mozapps/webextensions/heart.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/heart.png rename to toolkit/themes/osx/mozapps/webextensions/heart.png diff --git a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/localeGeneric.png rename to toolkit/themes/osx/mozapps/webextensions/localeGeneric.png diff --git a/toolkit/themes/linux/mozapps/extensions/newaddon.css b/toolkit/themes/osx/mozapps/webextensions/newaddon.css similarity index 78% rename from toolkit/themes/linux/mozapps/extensions/newaddon.css rename to toolkit/themes/osx/mozapps/webextensions/newaddon.css index edfba0ef5..5856c08b5 100644 --- a/toolkit/themes/linux/mozapps/extensions/newaddon.css +++ b/toolkit/themes/osx/mozapps/webextensions/newaddon.css @@ -2,4 +2,4 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../shared/extensions/newaddon.inc.css +%include ../../../shared/webextensions/newaddon.inc.css diff --git a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/rating-not-won.png rename to toolkit/themes/osx/mozapps/webextensions/rating-not-won.png diff --git a/toolkit/themes/osx/mozapps/extensions/rating-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-won.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/rating-won.png rename to toolkit/themes/osx/mozapps/webextensions/rating-won.png diff --git a/toolkit/themes/osx/mozapps/extensions/search.png b/toolkit/themes/osx/mozapps/webextensions/search.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/search.png rename to toolkit/themes/osx/mozapps/webextensions/search.png diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png rename to toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/themeGeneric.png rename to toolkit/themes/osx/mozapps/webextensions/themeGeneric.png diff --git a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png rename to toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png diff --git a/toolkit/themes/osx/mozapps/extensions/update.css b/toolkit/themes/osx/mozapps/webextensions/update.css similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/update.css rename to toolkit/themes/osx/mozapps/webextensions/update.css diff --git a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css similarity index 100% rename from toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css rename to toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css diff --git a/toolkit/themes/shared/mozapps.inc.mn b/toolkit/themes/shared/mozapps.inc.mn index bb43fd4d2..fadd203b0 100644 --- a/toolkit/themes/shared/mozapps.inc.mn +++ b/toolkit/themes/shared/mozapps.inc.mn @@ -7,13 +7,15 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. - skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/extensions/extensionGeneric.svg) - skin/classic/mozapps/extensions/utilities.svg (../../shared/extensions/utilities.svg) - skin/classic/mozapps/extensions/navigation.png (../../shared/extensions/navigation.png) - skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/extensions/alerticon-warning.svg) - skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/extensions/alerticon-error.svg) - skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg) - skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/webextensions/extensionGeneric.svg) + skin/classic/mozapps/extensions/utilities.svg (../../shared/webextensions/utilities.svg) + skin/classic/mozapps/extensions/navigation.png (../../shared/webextensions/navigation.png) + skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/webextensions/alerticon-warning.svg) + skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/webextensions/alerticon-error.svg) + skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/webextensions/alerticon-info-positive.svg) + skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/webextensions/alerticon-info-negative.svg) +#endif skin/classic/mozapps/formautofill/requestAutocomplete.css (../../shared/formautofill/requestAutocomplete.css) skin/classic/mozapps/plugins/pluginProblem.css (../../shared/plugins/pluginProblem.css) skin/classic/mozapps/aboutNetworking.css (../../shared/aboutNetworking.css) diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 859f1ba4a..a783bbb3c 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -107,27 +107,32 @@ skin/classic/mozapps/downloads/downloadButtons.png (../../windows/mozapps/downloads/downloadButtons.png) skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css) - skin/classic/mozapps/extensions/about.css (../../windows/mozapps/extensions/about.css) - skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/extensions/blocklist.css) - skin/classic/mozapps/extensions/update.css (../../windows/mozapps/extensions/update.css) - skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/extensions/discover-logo.png) - skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/extensions/experimentGeneric.png) - skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/extensions/rating-won.png) - skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/extensions/rating-not-won.png) - skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/extensions/cancel.png) - skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/extensions/eula.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/about.css (../../windows/mozapps/webextensions/about.css) + skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/webextensions/blocklist.css) + skin/classic/mozapps/extensions/update.css (../../windows/mozapps/webextensions/update.css) + skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/webextensions/discover-logo.png) + skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/webextensions/experimentGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/webextensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/webextensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/webextensions/cancel.png) + skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/webextensions/eula.css) +#endif skin/classic/mozapps/handling/handling.css (../../windows/mozapps/handling/handling.css) skin/classic/mozapps/plugins/pluginBlocked-64.png (../../windows/mozapps/plugins/pluginBlocked-64.png) skin/classic/mozapps/plugins/pluginHelp-16.png (../../windows/mozapps/plugins/pluginHelp-16.png) skin/classic/mozapps/profile/profileSelection.css (../../windows/mozapps/profile/profileSelection.css) skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png) -* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/extensions/xpinstallConfirm.css) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/webextensions/xpinstallConfirm.css) +#endif #ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif +#ifdef MOZ_WEBEXTENSIONS % override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif % override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif % override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png @@ -138,4 +143,4 @@ % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/plugins/notifyPluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.png - +#endif diff --git a/toolkit/themes/shared/extensions/alerticon-error.svg b/toolkit/themes/shared/webextensions/alerticon-error.svg similarity index 100% rename from toolkit/themes/shared/extensions/alerticon-error.svg rename to toolkit/themes/shared/webextensions/alerticon-error.svg diff --git a/toolkit/themes/shared/extensions/alerticon-info-negative.svg b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg similarity index 100% rename from toolkit/themes/shared/extensions/alerticon-info-negative.svg rename to toolkit/themes/shared/webextensions/alerticon-info-negative.svg diff --git a/toolkit/themes/shared/extensions/alerticon-info-positive.svg b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg similarity index 100% rename from toolkit/themes/shared/extensions/alerticon-info-positive.svg rename to toolkit/themes/shared/webextensions/alerticon-info-positive.svg diff --git a/toolkit/themes/shared/extensions/alerticon-warning.svg b/toolkit/themes/shared/webextensions/alerticon-warning.svg similarity index 100% rename from toolkit/themes/shared/extensions/alerticon-warning.svg rename to toolkit/themes/shared/webextensions/alerticon-warning.svg diff --git a/toolkit/themes/shared/extensions/extensionGeneric.svg b/toolkit/themes/shared/webextensions/extensionGeneric.svg similarity index 100% rename from toolkit/themes/shared/extensions/extensionGeneric.svg rename to toolkit/themes/shared/webextensions/extensionGeneric.svg diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/webextensions/extensions.inc.css similarity index 100% rename from toolkit/themes/shared/extensions/extensions.inc.css rename to toolkit/themes/shared/webextensions/extensions.inc.css diff --git a/toolkit/themes/shared/extensions/navigation.png b/toolkit/themes/shared/webextensions/navigation.png similarity index 100% rename from toolkit/themes/shared/extensions/navigation.png rename to toolkit/themes/shared/webextensions/navigation.png diff --git a/toolkit/themes/shared/extensions/newaddon.inc.css b/toolkit/themes/shared/webextensions/newaddon.inc.css similarity index 100% rename from toolkit/themes/shared/extensions/newaddon.inc.css rename to toolkit/themes/shared/webextensions/newaddon.inc.css diff --git a/toolkit/themes/shared/extensions/utilities.svg b/toolkit/themes/shared/webextensions/utilities.svg similarity index 100% rename from toolkit/themes/shared/extensions/utilities.svg rename to toolkit/themes/shared/webextensions/utilities.svg diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn index 901e93e4e..b5907d016 100644 --- a/toolkit/themes/windows/mozapps/jar.mn +++ b/toolkit/themes/windows/mozapps/jar.mn @@ -6,21 +6,23 @@ toolkit.jar: #include ../../shared/mozapps.inc.mn skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) -* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) - skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) - skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) - skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) - skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) - skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) - skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) - skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) - skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) - skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) - skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) - skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) - skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) - skin/classic/mozapps/extensions/heart.png (extensions/heart.png) -* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) +#endif skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png) @@ -29,14 +31,16 @@ toolkit.jar: skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) skin/classic/mozapps/downloads/downloadButtons-XP.png (downloads/downloadButtons-XP.png) skin/classic/mozapps/downloads/downloadIcon-XP.png (downloads/downloadIcon-XP.png) - skin/classic/mozapps/extensions/category-discover-XP.png (extensions/category-discover-XP.png) - skin/classic/mozapps/extensions/category-plugins-XP.png (extensions/category-plugins-XP.png) - skin/classic/mozapps/extensions/category-recent-XP.png (extensions/category-recent-XP.png) - skin/classic/mozapps/extensions/category-available-XP.png (extensions/category-available-XP.png) - skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (extensions/extensionGeneric-16-XP.png) - skin/classic/mozapps/extensions/themeGeneric-XP.png (extensions/themeGeneric-XP.png) - skin/classic/mozapps/extensions/themeGeneric-16-XP.png (extensions/themeGeneric-16-XP.png) - skin/classic/mozapps/extensions/localeGeneric-XP.png (extensions/localeGeneric-XP.png) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/category-discover-XP.png (webextensions/category-discover-XP.png) + skin/classic/mozapps/extensions/category-plugins-XP.png (webextensions/category-plugins-XP.png) + skin/classic/mozapps/extensions/category-recent-XP.png (webextensions/category-recent-XP.png) + skin/classic/mozapps/extensions/category-available-XP.png (webextensions/category-available-XP.png) + skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (webextensions/extensionGeneric-16-XP.png) + skin/classic/mozapps/extensions/themeGeneric-XP.png (webextensions/themeGeneric-XP.png) + skin/classic/mozapps/extensions/themeGeneric-16-XP.png (webextensions/themeGeneric-16-XP.png) + skin/classic/mozapps/extensions/localeGeneric-XP.png (webextensions/localeGeneric-XP.png) +#endif skin/classic/mozapps/plugins/pluginGeneric-XP.png (plugins/pluginGeneric-XP.png) skin/classic/mozapps/plugins/pluginBlocked-XP.png (plugins/pluginBlocked-XP.png) skin/classic/mozapps/plugins/pluginGeneric-16-XP.png (plugins/pluginGeneric-16-XP.png) @@ -50,6 +54,7 @@ toolkit.jar: #endif % override chrome://mozapps/skin/downloads/downloadButtons.png chrome://mozapps/skin/downloads/downloadButtons-XP.png osversion<6 % override chrome://mozapps/skin/downloads/downloadIcon.png chrome://mozapps/skin/downloads/downloadIcon-XP.png osversion<6 +#ifdef MOZ_WEBEXTENSIONS % override chrome://mozapps/skin/extensions/category-discover.png chrome://mozapps/skin/extensions/category-discover-XP.png osversion<6 % override chrome://mozapps/skin/extensions/category-plugins.png chrome://mozapps/skin/extensions/category-plugins-XP.png osversion<6 % override chrome://mozapps/skin/extensions/category-recent.png chrome://mozapps/skin/extensions/category-recent-XP.png osversion<6 @@ -58,6 +63,7 @@ toolkit.jar: % override chrome://mozapps/skin/extensions/themeGeneric.png chrome://mozapps/skin/extensions/themeGeneric-XP.png osversion<6 % override chrome://mozapps/skin/extensions/themeGeneric-16.png chrome://mozapps/skin/extensions/themeGeneric-16-XP.png osversion<6 % override chrome://mozapps/skin/extensions/localeGeneric.png chrome://mozapps/skin/extensions/localeGeneric-XP.png osversion<6 +#endif % override chrome://mozapps/skin/plugins/pluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-XP.png osversion<6 % override chrome://mozapps/skin/plugins/pluginBlocked.png chrome://mozapps/skin/plugins/pluginBlocked-XP.png osversion<6 % override chrome://mozapps/skin/plugins/pluginGeneric-16.png chrome://mozapps/skin/plugins/pluginGeneric-16-XP.png osversion<6 diff --git a/toolkit/themes/windows/mozapps/extensions/about.css b/toolkit/themes/windows/mozapps/webextensions/about.css similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/about.css rename to toolkit/themes/windows/mozapps/webextensions/about.css diff --git a/toolkit/themes/windows/mozapps/extensions/blocklist.css b/toolkit/themes/windows/mozapps/webextensions/blocklist.css similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/blocklist.css rename to toolkit/themes/windows/mozapps/webextensions/blocklist.css diff --git a/toolkit/themes/windows/mozapps/extensions/cancel.png b/toolkit/themes/windows/mozapps/webextensions/cancel.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/cancel.png rename to toolkit/themes/windows/mozapps/webextensions/cancel.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-available-XP.png rename to toolkit/themes/windows/mozapps/webextensions/category-available-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-available.png b/toolkit/themes/windows/mozapps/webextensions/category-available.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-available.png rename to toolkit/themes/windows/mozapps/webextensions/category-available.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-discover-XP.png rename to toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover.png b/toolkit/themes/windows/mozapps/webextensions/category-discover.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-discover.png rename to toolkit/themes/windows/mozapps/webextensions/category-discover.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png rename to toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-plugins.png rename to toolkit/themes/windows/mozapps/webextensions/category-plugins.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-recent-XP.png rename to toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent.png b/toolkit/themes/windows/mozapps/webextensions/category-recent.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-recent.png rename to toolkit/themes/windows/mozapps/webextensions/category-recent.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-search.png b/toolkit/themes/windows/mozapps/webextensions/category-search.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-search.png rename to toolkit/themes/windows/mozapps/webextensions/category-search.png diff --git a/toolkit/themes/windows/mozapps/extensions/category-service.png b/toolkit/themes/windows/mozapps/webextensions/category-service.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/category-service.png rename to toolkit/themes/windows/mozapps/webextensions/category-service.png diff --git a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png rename to toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png rename to toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png diff --git a/toolkit/themes/windows/mozapps/extensions/discover-logo.png b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/discover-logo.png rename to toolkit/themes/windows/mozapps/webextensions/discover-logo.png diff --git a/toolkit/themes/windows/mozapps/extensions/eula.css b/toolkit/themes/windows/mozapps/webextensions/eula.css similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/eula.css rename to toolkit/themes/windows/mozapps/webextensions/eula.css diff --git a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/experimentGeneric.png rename to toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png rename to toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png rename to toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/webextensions/extensions.css similarity index 95% rename from toolkit/themes/windows/mozapps/extensions/extensions.css rename to toolkit/themes/windows/mozapps/webextensions/extensions.css index 335a31bde..7c4aed05e 100644 --- a/toolkit/themes/windows/mozapps/extensions/extensions.css +++ b/toolkit/themes/windows/mozapps/webextensions/extensions.css @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../shared/extensions/extensions.inc.css +%include ../../../shared/webextensions/extensions.inc.css #header-utils-btn { list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); diff --git a/toolkit/themes/windows/mozapps/extensions/heart.png b/toolkit/themes/windows/mozapps/webextensions/heart.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/heart.png rename to toolkit/themes/windows/mozapps/webextensions/heart.png diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png rename to toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/localeGeneric.png rename to toolkit/themes/windows/mozapps/webextensions/localeGeneric.png diff --git a/toolkit/themes/osx/mozapps/extensions/newaddon.css b/toolkit/themes/windows/mozapps/webextensions/newaddon.css similarity index 78% rename from toolkit/themes/osx/mozapps/extensions/newaddon.css rename to toolkit/themes/windows/mozapps/webextensions/newaddon.css index edfba0ef5..5856c08b5 100644 --- a/toolkit/themes/osx/mozapps/extensions/newaddon.css +++ b/toolkit/themes/windows/mozapps/webextensions/newaddon.css @@ -2,4 +2,4 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../shared/extensions/newaddon.inc.css +%include ../../../shared/webextensions/newaddon.inc.css diff --git a/toolkit/themes/windows/mozapps/extensions/rating-not-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/rating-not-won.png rename to toolkit/themes/windows/mozapps/webextensions/rating-not-won.png diff --git a/toolkit/themes/windows/mozapps/extensions/rating-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-won.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/rating-won.png rename to toolkit/themes/windows/mozapps/webextensions/rating-won.png diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png rename to toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png rename to toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png rename to toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/themeGeneric.png rename to toolkit/themes/windows/mozapps/webextensions/themeGeneric.png diff --git a/toolkit/themes/windows/mozapps/extensions/update.css b/toolkit/themes/windows/mozapps/webextensions/update.css similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/update.css rename to toolkit/themes/windows/mozapps/webextensions/update.css diff --git a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css similarity index 100% rename from toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css rename to toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css