summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/extensions/test/addons
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-10 02:49:12 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-10 02:49:12 -0500
commit4fb11cd5966461bccc3ed1599b808237be6b0de9 (patch)
treed7f0ccd49cebb3544d52635ff1bd6ed4d763823f /toolkit/mozapps/extensions/test/addons
parentf164d9124708b50789dbb6959e1de96cc5697c48 (diff)
downloadUXP-4fb11cd5966461bccc3ed1599b808237be6b0de9.tar
UXP-4fb11cd5966461bccc3ed1599b808237be6b0de9.tar.gz
UXP-4fb11cd5966461bccc3ed1599b808237be6b0de9.tar.lz
UXP-4fb11cd5966461bccc3ed1599b808237be6b0de9.tar.xz
UXP-4fb11cd5966461bccc3ed1599b808237be6b0de9.zip
Move WebExtensions enabled Add-ons Manager
Diffstat (limited to 'toolkit/mozapps/extensions/test/addons')
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf19
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf19
-rw-r--r--toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf19
-rw-r--r--toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js29
-rw-r--r--toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/min1max1/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/min1max2/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/min1max3/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf33
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm3
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm3
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm3
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js5
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf21
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf21
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf20
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf20
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf21
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf21
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf26
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf78
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js7
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile20
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf21
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf18
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js9
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf19
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug675371/test.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest6
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest7
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest9
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jarbin180 -> 0 bytes
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest6
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest2
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest7
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf58
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf59
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf27
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf27
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js8
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic2
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic2
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf25
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf16
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_getresource/icon.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install1/icon.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install1/icon64.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install1/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install3/install.rdf27
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpibin509 -> 0 bytes
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/addon5.jarbin512 -> 0 bytes
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpibin512 -> 0 bytes
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/addon7.jarbin512 -> 0 bytes
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/icon.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install4/install.rdf10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install5/install.rdf26
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install6/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install7/install.rdf10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_install8/install.rdf10
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js17
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_locale/install.rdf61
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest6
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf24
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf26
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js62
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_theme/install.rdf26
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_theme/preview.png1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js1
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf28
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update12/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update8/install.rdf23
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js5
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf16
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpibin693 -> 0 bytes
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf9
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js5
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf16
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js5
-rw-r--r--toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf16
-rw-r--r--toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf22
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest1
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json14
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf30
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json10
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json10
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json10
-rw-r--r--toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json12
221 files changed, 0 insertions, 3861 deletions
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf
deleted file mode 100644
index 7b1b02a17..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_1/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>hardblock@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Hardblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf
deleted file mode 100644
index ae364637e..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_2/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>hardblock@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>Hardblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf
deleted file mode 100644
index 568c41a43..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_hard1_3/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>hardblock@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>Hardblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
deleted file mode 100644
index 1281ab53f..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_1/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>regexpblock@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>RegExp-blocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
deleted file mode 100644
index 8b6dd09f5..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_2/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>regexpblock@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>RegExp-blocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
deleted file mode 100644
index fade395f9..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_regexp1_3/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>regexpblock@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>RegExp-blocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf
deleted file mode 100644
index 4a18f64e0..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_1/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf
deleted file mode 100644
index 8a2519222..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_2/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf
deleted file mode 100644
index 2c55e5ff7..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft1_3/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock1@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf
deleted file mode 100644
index eebac4b21..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_1/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock2@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf
deleted file mode 100644
index f37741d04..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_2/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock2@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf
deleted file mode 100644
index e15f99264..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft2_3/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock2@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf
deleted file mode 100644
index f4b70a24b..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_1/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock3@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf
deleted file mode 100644
index 987204fa6..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_2/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock3@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf
deleted file mode 100644
index 19ab4b9fe..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft3_3/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock3@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf
deleted file mode 100644
index a3cd06f5f..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_1/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock4@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf
deleted file mode 100644
index eeff9fb79..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_2/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock4@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf
deleted file mode 100644
index 1d2650603..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft4_3/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock4@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf
deleted file mode 100644
index 85d7108d6..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_1/install.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock5@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:internalName>test/1.0</em:internalName>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf
deleted file mode 100644
index 394fd909e..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_2/install.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock5@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:internalName>test/1.0</em:internalName>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf b/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf
deleted file mode 100644
index 2a1fec25a..000000000
--- a/toolkit/mozapps/extensions/test/addons/blocklist_soft5_3/install.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>softblock5@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:name>Softblocked add-on</em:name>
- <em:internalName>test/1.0</em:internalName>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js b/toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js
deleted file mode 100644
index a5d5beb34..000000000
--- a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/bootstrap.js
+++ /dev/null
@@ -1,29 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var seenGlobals = new Set();
-var scope = this;
-function checkGlobal(name, type) {
- if (scope[name] && typeof(scope[name]) == type)
- seenGlobals.add(name);
-}
-
-var wrapped = {};
-Services.obs.notifyObservers({ wrappedJSObject: wrapped }, "bootstrap-request-globals", null);
-for (let [name, type] of wrapped.expectedGlobals) {
- checkGlobal(name, type);
-}
-
-function install(data, reason) {
-}
-
-function startup(data, reason) {
- Services.obs.notifyObservers({
- wrappedJSObject: seenGlobals
- }, "bootstrap-seen-globals", null);
-}
-
-function shutdown(data, reason) {
-}
-
-function uninstall(data, reason) {
-}
diff --git a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf b/toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf
deleted file mode 100644
index f11a626fd..000000000
--- a/toolkit/mozapps/extensions/test/addons/bootstrap_globals/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap_globals@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap Globals</em:name>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/min1max1/install.rdf b/toolkit/mozapps/extensions/test/addons/min1max1/install.rdf
deleted file mode 100644
index 3a0ace227..000000000
--- a/toolkit/mozapps/extensions/test/addons/min1max1/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>min1max1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test minVersion 1 maxVersion 1</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/min1max2/install.rdf b/toolkit/mozapps/extensions/test/addons/min1max2/install.rdf
deleted file mode 100644
index 0184f1963..000000000
--- a/toolkit/mozapps/extensions/test/addons/min1max2/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>min1max2@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test minVersion 1 maxVersion 2</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/min1max3/install.rdf b/toolkit/mozapps/extensions/test/addons/min1max3/install.rdf
deleted file mode 100644
index dbb1b7318..000000000
--- a/toolkit/mozapps/extensions/test/addons/min1max3/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>min1max3@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test minVersion 1 maxVersion 3</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf b/toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf
deleted file mode 100644
index f50c65c6a..000000000
--- a/toolkit/mozapps/extensions/test/addons/min1max3b/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>min1max3b@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Another Test minVersion 1 maxVersion 3</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf b/toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf
deleted file mode 100644
index 92cf3ec96..000000000
--- a/toolkit/mozapps/extensions/test/addons/override1x2-1x3/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>override1x2-1x3@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:updateURL>http://localhost:4444/data/test_bug542391.rdf</em:updateURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test override compat from 1..2 to 1..3</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf
deleted file mode 100644
index 82cfd0472..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_1/install.rdf
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_AddonRepository_1@tests.mozilla.org</em:id>
- <em:version>1.1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>XPI Add-on 1</em:name>
- <em:description>XPI Add-on 1 - Description</em:description>
- <em:creator>XPI Add-on 1 - Creator</em:creator>
- <em:developer>XPI Add-on 1 - First Developer</em:developer>
- <em:developer>XPI Add-on 1 - Second Developer</em:developer>
- <em:translator>XPI Add-on 1 - First Translator</em:translator>
- <em:translator>XPI Add-on 1 - Second Translator</em:translator>
- <em:contributor>XPI Add-on 1 - First Contributor</em:contributor>
- <em:contributor>XPI Add-on 1 - Second Contributor</em:contributor>
- <em:homepageURL>http://localhost/xpi/1/homepage.html</em:homepageURL>
- <em:optionsURL>http://localhost/xpi/1/options.html</em:optionsURL>
- <em:aboutURL>http://localhost/xpi/1/about.html</em:aboutURL>
- <em:iconURL>http://localhost/xpi/1/icon.png</em:iconURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf
deleted file mode 100644
index 80776e6c3..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_2/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_AddonRepository_2@tests.mozilla.org</em:id>
- <em:type>4</em:type>
- <em:internalName>test2/1.0</em:internalName>
- <em:version>1.2</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>XPI Add-on 2</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png b/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png
deleted file mode 100644
index 41409edfe..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-Fake icon image
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf
deleted file mode 100644
index bade9c069..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_AddonRepository_3@tests.mozilla.org</em:id>
- <em:type>4</em:type>
- <em:internalName>test3/1.0</em:internalName>
- <em:version>1.3</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>XPI Add-on 3</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png b/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png
deleted file mode 100644
index 321ce47cf..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_AddonRepository_3/preview.png
+++ /dev/null
@@ -1 +0,0 @@
-Fake preview image
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf
deleted file mode 100644
index f02a3869c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm
deleted file mode 100644
index 7fe60e632..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_1/version.jsm
+++ /dev/null
@@ -1,3 +0,0 @@
-this.EXPORTED_SYMBOLS = ["VERSION"];
-
-this.VERSION = 1;
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf
deleted file mode 100644
index 480f03fd1..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm
deleted file mode 100644
index 532741e12..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_2/version.jsm
+++ /dev/null
@@ -1,3 +0,0 @@
-this.EXPORTED_SYMBOLS = ["VERSION"];
-
-this.VERSION = 2;
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf
deleted file mode 100644
index e9385cbb3..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap1@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>undefined</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm
deleted file mode 100644
index 1b813faaf..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/version.jsm
+++ /dev/null
@@ -1,3 +0,0 @@
-this.EXPORTED_SYMBOLS = ["VERSION"];
-
-this.VERSION = 3;
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf
deleted file mode 100644
index 2b88e0ad0..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_4/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap1@tests.mozilla.org</em:id>
- <em:version>4.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf
deleted file mode 100644
index e0e8ca978..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap2_1/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap2@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 2</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js
deleted file mode 100644
index 0e45caec4..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/bootstrap.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-const install = function() {
- Services.obs.notifyObservers(null, "addon-install", "");
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf
deleted file mode 100644
index 898282991..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bootstrap_const/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bootstrap@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf
deleted file mode 100644
index 791a6263f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-2@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <!-- XPCShell -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Toolkit -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716_2.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf
deleted file mode 100644
index 36d15b8aa..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-a@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>5</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test A</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf
deleted file mode 100644
index 3521a503c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-a@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>5</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test A</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf
deleted file mode 100644
index d92a4ec41..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-b@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test B</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf
deleted file mode 100644
index c3ad76b84..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-b@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test B</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf
deleted file mode 100644
index a937b6e76..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-c@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <!-- XPCShell -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>5</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Toolkit -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test C</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf
deleted file mode 100644
index 8afca3ff9..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-c@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <!-- XPCShell -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>5</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Toolkit -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test C</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf
deleted file mode 100644
index 4c0dcc2ef..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-d@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <!-- XPCShell -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>5</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Toolkit, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test D</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf
deleted file mode 100644
index 2b113809a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-d@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <!-- XPCShell -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>5</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Toolkit, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test D</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf
deleted file mode 100644
index 03eb7180e..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-e@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <!-- Toolkit -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- XPCShell, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test E</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf
deleted file mode 100644
index 3ed7cd932..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-e@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <!-- Toolkit -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- XPCShell, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test E</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf
deleted file mode 100644
index cacf824c1..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-f@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <!-- Toolkit, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- XPCShell, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test F</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf
deleted file mode 100644
index 09954ec36..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-f@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <!-- Toolkit, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- XPCShell, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test F</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf
deleted file mode 100644
index 5e4a6f6a2..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-g@tests.mozilla.org</em:id>
- <em:version>0.1</em:version>
-
- <!-- Toolkit, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test G</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf
deleted file mode 100644
index 913233cec..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug299716-g@tests.mozilla.org</em:id>
- <em:version>0.2</em:version>
-
- <!-- Toolkit, invalid -->
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>30</em:minVersion>
- <em:maxVersion>30</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 299716 test G</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug299716.rdf</em:updateURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf
deleted file mode 100644
index fd0dd50b7..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_1@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 1</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_1.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf
deleted file mode 100644
index 607b68357..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_2@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 2</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf
deleted file mode 100644
index 3a4c7eafc..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_3@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 5</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf
deleted file mode 100644
index 8557df116..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_4@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 4</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_4.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf
deleted file mode 100644
index 343a9d44c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_5@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 5</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_5.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf
deleted file mode 100644
index 5a724cc99..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_6@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 6</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf
deleted file mode 100644
index 70fe81168..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_7@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 7</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf
deleted file mode 100644
index 2aface3b4..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_8@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 8</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_8.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf
deleted file mode 100644
index 7804e833c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Compatible to install -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug324121_9@tests.mozilla.org</em:id>
- <em:version>1</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 324121 Test 9</em:name>
- <em:updateURL>http://localhost:4444/data/test_bug324121_9.rdf</em:updateURL>
-
- </Description>
-</RDF>
-
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
deleted file mode 100644
index c60b5711b..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug335238_1@tests.mozilla.org</em:id>
- <em:version>1.3.4</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 335238</em:name>
- <em:updateURL>http://localhost:4444/0?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
deleted file mode 100644
index 23faf5a34..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug335238_2@tests.mozilla.org</em:id>
- <em:version>28at</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>7</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:requires>
- <Description>
- <em:id>unknown@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>72</em:maxVersion>
- </Description>
- </em:requires>
-
- <em:name>Bug 335238</em:name>
- <em:updateURL>http://localhost:4444/1?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf
deleted file mode 100644
index d44448208..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_3/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug335238_3@tests.mozilla.org</em:id>
- <em:version>58</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>*</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:requires>
- <Description>
- <em:id>unknown@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>72</em:maxVersion>
- </Description>
- </em:requires>
-
- <em:name>Bug 335238</em:name>
- <em:updateURL>http://localhost:4444/2?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf
deleted file mode 100644
index 6ec052d36..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug335238_4/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug335238_4@tests.mozilla.org</em:id>
- <em:version>4</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2+</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:requires>
- <Description>
- <em:id>unknown@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>72</em:maxVersion>
- </Description>
- </em:requires>
-
- <em:name>Bug 335238</em:name>
- <em:updateURL>http://localhost:4444/3?id=%ITEM_ID%&amp;version=%ITEM_VERSION%&amp;maxAppVersion=%ITEM_MAXAPPVERSION%&amp;status=%ITEM_STATUS%&amp;appId=%APP_ID%&amp;appVersion=%APP_VERSION%&amp;appOs=%APP_OS%&amp;appAbi=%APP_ABI%&amp;locale=%APP_LOCALE%&amp;reqVersion=%REQ_VERSION%</em:updateURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf
deleted file mode 100644
index c60caf594..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug371495/install.rdf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug371495@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test theme</em:name>
- <em:type>4</em:type>
- <em:internalName>test/1.0</em:internalName>
- <em:optionsURL>chrome://foo/content/bar.xul</em:optionsURL>
- <em:aboutURL>chrome://foo/content/bar.xul</em:aboutURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf
deleted file mode 100644
index 2e5ace760..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug394300_1@tests.mozilla.org</em:id>
- <em:version>5</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 394300 Test 1</em:name>
- <em:updateURL>http://localhost:4444/test_bug394300.rdf</em:updateURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf
deleted file mode 100644
index ae54424d1..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug394300_2@tests.mozilla.org</em:id>
- <em:version>5</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1.9</em:minVersion>
- <em:maxVersion>1.9</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:name>Bug 394300 Test 2</em:name>
- <em:updateURL>http://localhost:4444/test_bug394300.rdf</em:updateURL>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf
deleted file mode 100644
index cfcfd406f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug397778@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:localized>
- <Description em:locale="fr">
- <em:name>fr Name</em:name>
- <em:description>fr Description</em:description>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="de-DE">
- <em:name>de-DE Name</em:name>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="ES-es">
- <em:name>es-ES Name</em:name>
- <em:description>es-ES Description</em:description>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="zh-TW">
- <em:name>zh-TW Name</em:name>
- <em:description>zh-TW Description</em:description>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="zh-CN">
- <em:name>zh-CN Name</em:name>
- <em:description>zh-CN Description</em:description>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="en-GB">
- <em:name>en-GB Name</em:name>
- <em:description>en-GB Description</em:description>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="en">
- <em:name>en Name</em:name>
- <em:description>en Description</em:description>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="en-CA">
- <em:name>en-CA Name</em:name>
- <em:description>en-CA Description</em:description>
- </Description>
- </em:localized>
-
- <!-- Front End MetaData -->
- <em:name>Fallback Name</em:name>
- <em:description>Fallback Description</em:description>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf
deleted file mode 100644
index e4e1b339b..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug425657@tests.mozilla.org</em:id>
- <em:version>1</em:version>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>Deutsches Wörterbuch</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf
deleted file mode 100644
index 5397e8a87..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_1/install.rdf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug470377_1@tests.mozilla.org</em:id>
- <em:version>1</em:version>
- <em:targetApplication>
- <Description>
- <em:id>unknown@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>Test for Bug 470377</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf
deleted file mode 100644
index b1dde7f7a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_2/install.rdf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug470377_2@tests.mozilla.org</em:id>
- <em:version>1</em:version>
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>Test for Bug 470377</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf
deleted file mode 100644
index ae483434a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_3/install.rdf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug470377_3@tests.mozilla.org</em:id>
- <em:version>1</em:version>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>Test for Bug 470377</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf
deleted file mode 100644
index 97abacc5e..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_4/install.rdf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug470377_4@tests.mozilla.org</em:id>
- <em:version>1</em:version>
- <em:targetApplication>
- <Description>
- <em:id>toolkit@mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>Test for Bug 470377</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf
deleted file mode 100644
index bff1104a7..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug470377_5/install.rdf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug470377_5@tests.mozilla.org</em:id>
- <em:version>1</em:version>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>Test for Bug 470377</em:name>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf
deleted file mode 100644
index 444bdc556..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug521905/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug521905@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Bug 521905</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf
deleted file mode 100644
index f97bd1302..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug567173/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug567173</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test Bug 567173</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js
deleted file mode 100644
index 09c083532..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug567184/bootstrap.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function install(data, reason) { }
-
-function startup(data, reason) { }
-
-function shutdown(data, reason) { }
-
-function uninstall(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf
deleted file mode 100644
index 1e13ceb87..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug567184/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug567184@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Bug 567184 Test</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>undefined</em:minVersion>
- <em:maxVersion>undefined</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf
deleted file mode 100644
index 83220ce06..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Bug 587088 Test</em:name>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile b/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile
deleted file mode 100644
index d2277257f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile
+++ /dev/null
@@ -1 +0,0 @@
-Contents of add-on version 1
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1 b/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1
deleted file mode 100644
index e69de29bb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_1/testfile1
+++ /dev/null
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf
deleted file mode 100644
index ba23ab802..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Bug 587088 Test</em:name>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile b/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile
deleted file mode 100644
index 07afddfa7..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile
+++ /dev/null
@@ -1 +0,0 @@
-Contents of add-on version 2
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2 b/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2
deleted file mode 100644
index e69de29bb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug587088_2/testfile2
+++ /dev/null
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1 b/toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1
deleted file mode 100644
index e69de29bb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug594058/directory/file1
+++ /dev/null
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf
deleted file mode 100644
index 682831949..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug594058/install.rdf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug594058@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
- <em:name>bug 594058</em:name>
- <em:description>stat-based invalidation</em:description>
- <em:unpack>true</em:unpack>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf
deleted file mode 100644
index 36c03fd00..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug595573/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is compatible with the XPCShell test suite -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>{2f69dacd-03df-4150-a9f1-e8a7b2748829}</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf
deleted file mode 100644
index a3fa0d707..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug655254/install.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Test 1</em:name>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js
deleted file mode 100644
index b79648e89..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/bootstrap.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-function startup(data, reason) {
- Services.prefs.setIntPref("bootstraptest.active_version", 1);
-}
-
-function shutdown(data, reason) {
- Services.prefs.setIntPref("bootstraptest.active_version", 0);
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf
deleted file mode 100644
index 71827885f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug655254_2/install.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon2@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:name>Test 2</em:name>
- <em:bootstrap>true</em:bootstrap>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf
deleted file mode 100644
index 3b34c63d3..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug659772/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is compatible with the XPCShell test suite -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon3@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest
deleted file mode 100644
index 17d5c99ec..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/chrome.manifest
+++ /dev/null
@@ -1 +0,0 @@
-content bug675371 .
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf
deleted file mode 100644
index ca2881e5a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug675371@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Bug 675371 Test</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js b/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js
deleted file mode 100644
index b942a8064..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js
+++ /dev/null
@@ -1 +0,0 @@
-var active = true;
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js
deleted file mode 100644
index 6703e7f7d..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-const APP_STARTUP = 1;
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf
deleted file mode 100644
index b2316273f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_1/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug740612_1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js
deleted file mode 100644
index 2ad481453..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/bootstrap.js
+++ /dev/null
@@ -1,23 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-const VERSION = "1.0";
-
-function install(data, reason) {
- Services.prefs.setIntPref("bootstraptest.installed_version", VERSION);
- Services.prefs.setIntPref("bootstraptest.install_reason", reason);
-}
-
-function startup(data, reason) {
- Services.prefs.setIntPref("bootstraptest.active_version", VERSION);
- Services.prefs.setIntPref("bootstraptest.startup_reason", reason);
-}
-
-function shutdown(data, reason) {
- Services.prefs.setIntPref("bootstraptest.active_version", 0);
- Services.prefs.setIntPref("bootstraptest.shutdown_reason", reason);
-}
-
-function uninstall(data, reason) {
- Services.prefs.setIntPref("bootstraptest.installed_version", 0);
- Services.prefs.setIntPref("bootstraptest.uninstall_reason", reason);
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf
deleted file mode 100644
index ff4d613ef..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug740612_2/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug740612_2@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 2</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf
deleted file mode 100644
index be8d85b1b..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_bug757663/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>bug757663@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf
deleted file mode 100644
index 5e64b65c1..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>File Pointer Test</em:name>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf
deleted file mode 100644
index 7728002ea..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon2@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>File Pointer Test</em:name>
- <em:bootstrap>true</em:bootstrap>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest
deleted file mode 100644
index 4d63b6b06..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/chrome.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-content test-addon-1 chrome/content
-# comment!
- locale test-addon-1 en-US locale/en-US
- # commentaire!
- locale test-addon-1 fr-FR locale/fr-FR
-overlay chrome://browser/content/browser.xul chrome://test-addon-1/content/overlay.xul
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf
deleted file mode 100644
index 486be8670..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_1/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest
deleted file mode 100644
index 3b0195077..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/chrome.manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-content test-addon-1 chrome/content
-
- locale test-addon-1 en-US locale/en-US
- locale test-addon-1 fr-FR locale/fr-FR
-overlay chrome://browser/content/browser.xul chrome://test-addon-1/content/overlay.xul
-binary-component components/something.so
-manifest thisdoesntexist.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf
deleted file mode 100644
index 9a9ee4823..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_2/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon2@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 2</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>true</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest
deleted file mode 100644
index 73190ed8f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/chrome.manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-content test-addon-1 chrome/content
-
- locale test-addon-1 en-US locale/en-US
- locale test-addon-1 fr-FR locale/fr-FR
-overlay chrome://browser/content/browser.xul chrome://test-addon-1/content/overlay.xul
-
- binary-component components/something.so
-
- manifest jar:inner.jar!/nested.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar
deleted file mode 100644
index b4a40052f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/inner.jar
+++ /dev/null
Binary files differ
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf
deleted file mode 100644
index 3a4a709e0..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_3/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon3@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 3</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>true</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest
deleted file mode 100644
index 60d4f01f0..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/chrome.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-content test-addon-1 chrome/content
-
- locale test-addon-1 en-US locale/en-US
- locale test-addon-1 fr-FR locale/fr-FR
-overlay chrome://browser/content/browser.xul chrome://test-addon-1/content/overlay.xul
- manifest components/components.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest
deleted file mode 100644
index 1e0aea440..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/components.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-binary-component mycomponent.dll
-manifest other/something.manifest
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest
deleted file mode 100644
index 73d58dd66..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/components/other/something.manifest
+++ /dev/null
@@ -1 +0,0 @@
-binary-component thermalnuclearwar.dll
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf
deleted file mode 100644
index 463e3f27e..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_4/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon4@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 4</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>true</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest
deleted file mode 100644
index b0aa32adc..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/chrome.manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-content test-addon-1 chrome/content
-
- locale test-addon-1 en-US locale/en-US
- locale test-addon-1 fr-FR locale/fr-FR
-overlay chrome://browser/content/browser.xul chrome://test-addon-1/content/overlay.xul
-
- binary-component components/something.so
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf
deleted file mode 100644
index 7836bced8..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_5/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon5@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 5</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>false</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest
deleted file mode 100644
index 4ebb75c30..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/chrome.manifest
+++ /dev/null
@@ -1 +0,0 @@
-resource test-addon-1 .
diff --git a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf b/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf
deleted file mode 100644
index 5d94de0ea..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_chromemanifest_6/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon6@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 6</em:name>
- <em:description>Test Description</em:description>
- <em:bootstrap>true</em:bootstrap>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf b/toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf
deleted file mode 100644
index aebfe3b68..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_data_directory/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>datadirectory1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test Data Directory 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf
deleted file mode 100644
index e1f2b5173..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_1/install.rdf
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_db_sanity_1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
- <em:creator>Keyboard Cat</em:creator>
- <em:homepageURL>http://mozilla.org/</em:homepageURL>
-
- <em:contributor>Keyboard Cat 2</em:contributor>
- <em:translator>Keyboard Cat 3</em:translator>
-
- <em:localized>
- <Description>
- <em:locale>en-1</em:locale>
- <em:name>Test 1 (en-1)</em:name>
- <em:description>Test Description (en-1)</em:description>
- <em:creator>Keyboard Cat (en-1)</em:creator>
- <em:homepageURL>http://mozilla.org/en-1/</em:homepageURL>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description>
- <em:locale>en-2</em:locale>
- <em:name>Test 1 (en-2)</em:name>
- <em:description>Test Description (en-2)</em:description>
- <em:creator>Keyboard Cat (en-2)</em:creator>
- <em:homepageURL>http://mozilla.org/en-2/</em:homepageURL>
- </Description>
- </em:localized>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:targetApplication>
- <Description>
- <em:id>keyboard-cats-awesome-browser@keyboard.cat</em:id>
- <em:minVersion>3.1415</em:minVersion>
- <em:maxVersion>3.1415</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:targetPlatform>XPCShell_noarch-spidermonkey</em:targetPlatform>
- <em:targetPlatform>WINNT_x86</em:targetPlatform>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf
deleted file mode 100644
index da9b067ab..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_db_sanity_1_2/install.rdf
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_db_sanity_1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <em:name>Test 1</em:name>
- <em:description>Test Description!!!</em:description>
- <em:creator>Keyboard Cat</em:creator>
- <em:homepageURL>http://mozilla.org/</em:homepageURL>
-
- <em:contributor>Keyboard Cat 2</em:contributor>
- <em:translator>Keyboard Cat 3</em:translator>
- <em:translator>Keyboard Cat 4</em:translator>
-
- <em:localized>
- <Description>
- <em:locale>en-1</em:locale>
- <em:name>Test 1 (en-1)</em:name>
- <em:description>Test Description (en-1)</em:description>
- <em:creator>Keyboard Cat (en-1)</em:creator>
- <em:homepageURL>http://mozilla.org/en-1/</em:homepageURL>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description>
- <em:locale>en-3</em:locale>
- <em:name>Test 1 (en-3)</em:name>
- <em:description>Test Description (en-3)</em:description>
- <em:creator>Keyboard Cat (en-3)</em:creator>
- <em:homepageURL>http://mozilla.org/en-3/</em:homepageURL>
- </Description>
- </em:localized>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:targetApplication>
- <Description>
- <em:id>keyboard-cats-awesome-browser-3000@keyboard.cat</em:id>
- <em:minVersion>3.1415</em:minVersion>
- <em:maxVersion>3.1415</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:targetPlatform>XPCShell_noarch-spidermonkey</em:targetPlatform>
- <em:targetPlatform>WINNT_i386</em:targetPlatform>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js
deleted file mode 100644
index c5a80c7b9..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/bootstrap.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
-
-const ADDON_ID = "test_delay_update_complete@tests.mozilla.org";
-
-function install(data, reason) {}
-
-function startup(data, reason) {}
-
-function shutdown(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf
deleted file mode 100644
index 3ebbe16b0..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_v2/install.rdf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_delay_update_complete@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Delay Update Complete</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json b/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json
deleted file mode 100644
index 1a98f4660..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_complete_webextension_v2/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "manifest_version": 2,
- "name": "Delay Upgrade",
- "version": "2.0",
- "applications": {
- "gecko": {
- "id": "test_delay_update_complete_webext@tests.mozilla.org"
- }
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js
deleted file mode 100644
index dea028488..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/bootstrap.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
-
-const ADDON_ID = "test_delay_update_defer@tests.mozilla.org";
-
-function install(data, reason) {}
-
-function startup(data, reason) {}
-
-function shutdown(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf
deleted file mode 100644
index 75c7666bb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_v2/install.rdf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_delay_update_defer@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Delay Update Defer</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json b/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json
deleted file mode 100644
index 9561979dc..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_defer_webextension_v2/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "manifest_version": 2,
- "name": "Delay Upgrade",
- "version": "2.0",
- "applications": {
- "gecko": {
- "id": "test_delay_update_defer_webext@tests.mozilla.org"
- }
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js
deleted file mode 100644
index fb8fc9540..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/bootstrap.js
+++ /dev/null
@@ -1,8 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
-
-function install(data, reason) {}
-
-function startup(data, reason) {}
-
-function shutdown(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf
deleted file mode 100644
index aec4b202e..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_v2/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_delay_update_ignore@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Delay Update Ignore</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
- <em:updateURL>http://localhost:4444/data/test_delay_updates_ignore.rdf</em:updateURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
diff --git a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json b/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json
deleted file mode 100644
index d9200ec11..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_delay_update_ignore_webextension_v2/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "manifest_version": 2,
- "name": "Delay Upgrade",
- "version": "2.0",
- "applications": {
- "gecko": {
- "id": "test_delay_update_ignore_webext@tests.mozilla.org"
- }
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest
deleted file mode 100644
index c945c928c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary/chrome.manifest
+++ /dev/null
@@ -1 +0,0 @@
-content dict ./
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic b/toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic
deleted file mode 100644
index 3feac546d..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary/dictionaries/ab-CD.dic
+++ /dev/null
@@ -1,2 +0,0 @@
-1
-test1
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf b/toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf
deleted file mode 100644
index 9e66ab237..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>ab-CD@dictionaries.addons.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:type>64</em:type>
- <em:unpack>true</em:unpack>
-
- <!-- Front End MetaData -->
- <em:name>Test Dictionary</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic b/toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic
deleted file mode 100644
index b35b9c1a6..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/dictionaries/ab-CD.dic
+++ /dev/null
@@ -1,2 +0,0 @@
-1
-test2
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf
deleted file mode 100644
index a74a114fd..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_2/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>ab-CD@dictionaries.addons.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:unpack>true</em:unpack>
-
- <!-- Front End MetaData -->
- <em:name>Test Dictionary</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf
deleted file mode 100644
index c056e87ff..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_3/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>ab-CD@dictionaries.addons.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:type>64</em:type>
- <em:unpack>true</em:unpack>
-
- <!-- Front End MetaData -->
- <em:name>Test Dictionary</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf
deleted file mode 100644
index 7470284ba..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_4/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>ef@dictionaries.addons.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:unpack>true</em:unpack>
-
- <!-- Front End MetaData -->
- <em:name>Test Dictionary ef</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf
deleted file mode 100644
index 11eba90d7..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_dictionary_5/install.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>gh@dictionaries.addons.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:type>64</em:type>
- <em:unpack>true</em:unpack>
-
- <!-- Front End MetaData -->
- <em:name>Test Dictionary gh</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf
deleted file mode 100644
index 8bd5966c9..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_distribution1_2/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Distributed add-ons test</em:name>
- <em:bootstrap>true</em:bootstrap>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>5</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_experiment1/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf
deleted file mode 100644
index 414a36b30..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_experiment1/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>experiment1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:type>128</em:type>
-
- <!-- Front End MetaData -->
- <em:name>Test Experiment 1</em:name>
- <em:description>Test Description</em:description>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf b/toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf
deleted file mode 100644
index 5e64b65c1..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_filepointer/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>File Pointer Test</em:name>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/icon.png b/toolkit/mozapps/extensions/test/addons/test_getresource/icon.png
deleted file mode 100644
index 40765b0e2..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_getresource/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-Dummy icon file \ No newline at end of file
diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf b/toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf
deleted file mode 100644
index 8d2740dbb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_getresource/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
- <em:bootstrap>true</em:bootstrap>
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt b/toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt
deleted file mode 100644
index a28d18162..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_getresource/subdir/subfile.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file in subdirectory \ No newline at end of file
diff --git a/toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf
deleted file mode 100644
index 7fcc1a09e..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_hotfix_1/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>hotfix@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf
deleted file mode 100644
index fd843dbe9..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_hotfix_2/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>hotfix@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/icon.png b/toolkit/mozapps/extensions/test/addons/test_install1/icon.png
deleted file mode 100644
index 41409edfe..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install1/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-Fake icon image
diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/icon64.png b/toolkit/mozapps/extensions/test/addons/test_install1/icon64.png
deleted file mode 100644
index 41409edfe..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install1/icon64.png
+++ /dev/null
@@ -1 +0,0 @@
-Fake icon image
diff --git a/toolkit/mozapps/extensions/test/addons/test_install1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install1/install.rdf
deleted file mode 100644
index efe3f18ae..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install1/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is compatible with the XPCShell test suite -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png b/toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png
deleted file mode 100644
index 41409edfe..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install2_1/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-Fake icon image
diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf
deleted file mode 100644
index 116eb7069..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install2_1/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is compatible with the XPCShell test suite -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon2@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Real Test 2</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf
deleted file mode 100644
index 7197ea1fb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install2_2/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is compatible with the XPCShell test suite -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon2@tests.mozilla.org</em:id>
- <em:version>3.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Real Test 3</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf
deleted file mode 100644
index 8e72017ad..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install3/install.rdf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is incompatible with the XPCShell test suite until
- a compatibility update check is performed -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon3@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Real Test 4</em:name>
- <em:description>Test Description</em:description>
-
- <em:updateURL>http://localhost:4444/data/test_install.rdf</em:updateURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>0</em:minVersion>
- <em:maxVersion>0</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi b/toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi
deleted file mode 100644
index e57a4f5b6..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon4.xpi
+++ /dev/null
Binary files differ
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar b/toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar
deleted file mode 100644
index 93fbfbe6e..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon5.jar
+++ /dev/null
Binary files differ
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi b/toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi
deleted file mode 100644
index 3613dab04..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon6.xpi
+++ /dev/null
Binary files differ
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar b/toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar
deleted file mode 100644
index 1af178887..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/addon7.jar
+++ /dev/null
Binary files differ
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar b/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar
deleted file mode 100644
index 33695b99f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.jar
+++ /dev/null
@@ -1 +0,0 @@
-This is corrupt
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi b/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi
deleted file mode 100644
index 33695b99f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/badaddon.xpi
+++ /dev/null
@@ -1 +0,0 @@
-This is corrupt
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/icon.png b/toolkit/mozapps/extensions/test/addons/test_install4/icon.png
deleted file mode 100644
index 57f2c2eb6..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-This is ignored
diff --git a/toolkit/mozapps/extensions/test/addons/test_install4/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install4/install.rdf
deleted file mode 100644
index 5e99ae29a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install4/install.rdf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- A multi-package XPI -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:type>32</em:type>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest
deleted file mode 100644
index 703adf2a7..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install5/chrome.manifest
+++ /dev/null
@@ -1 +0,0 @@
-binary-component components/mycomponent.so
diff --git a/toolkit/mozapps/extensions/test/addons/test_install5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install5/install.rdf
deleted file mode 100644
index 1f96e4b49..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install5/install.rdf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that is incompatible with the XPCShell test suite and
- has binary components, so won't be compatible-by-default. -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon5@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Real Test 5</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>true</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>0</em:minVersion>
- <em:maxVersion>0</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install6/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install6/install.rdf
deleted file mode 100644
index b1f97c1fd..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install6/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- An extension that has a compatibility override making it incompatible. -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon6@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Addon Test 6</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi b/toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi
deleted file mode 100644
index 9c283d1d4..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install7/addon1.xpi
+++ /dev/null
@@ -1 +0,0 @@
-This isn't a valid zip file. \ No newline at end of file
diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi b/toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi
deleted file mode 100644
index 9c283d1d4..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install7/addon2.xpi
+++ /dev/null
@@ -1 +0,0 @@
-This isn't a valid zip file. \ No newline at end of file
diff --git a/toolkit/mozapps/extensions/test/addons/test_install7/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install7/install.rdf
deleted file mode 100644
index 5e99ae29a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install7/install.rdf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- A multi-package XPI -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:type>32</em:type>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_install8/install.rdf b/toolkit/mozapps/extensions/test/addons/test_install8/install.rdf
deleted file mode 100644
index 5e99ae29a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_install8/install.rdf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- A multi-package XPI -->
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:type>32</em:type>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js
deleted file mode 100644
index 2449baeb8..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_jetpack/bootstrap.js
+++ /dev/null
@@ -1,17 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-function install(data, reason) {
- Services.prefs.setIntPref("jetpacktest.installed_version", 1);
-}
-
-function startup(data, reason) {
- Services.prefs.setIntPref("jetpacktest.active_version", 1);
-}
-
-function shutdown(data, reason) {
- Services.prefs.setIntPref("jetpacktest.active_version", 0);
-}
-
-function uninstall(data, reason) {
- Services.prefs.setIntPref("jetpacktest.installed_version", 0);
-}
diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json b/toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json
deleted file mode 100644
index 9e26dfeeb..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_jetpack/harness-options.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf b/toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf
deleted file mode 100644
index e88794a60..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_jetpack/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>jetpack@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test jetpack</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
deleted file mode 100644
index 16fe819a2..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
+++ /dev/null
@@ -1 +0,0 @@
-locale test-langpack x-testing locale/x-testing
diff --git a/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
deleted file mode 100644
index 056f6dff5..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>langpack-x-testing@tests.mozilla.org</em:id>
- <em:type>8</em:type>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Language Pack x-testing</em:name>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_locale/install.rdf b/toolkit/mozapps/extensions/test/addons/test_locale/install.rdf
deleted file mode 100644
index d8d027b93..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_locale/install.rdf
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:localized>
- <Description em:locale="fr-FR">
- <em:locale/> <!-- Should be ignored and not fail -->
- <em:name>fr-FR Name</em:name>
- <em:description>fr-FR Description</em:description>
- <em:contributor>Fr Contributor 1</em:contributor>
- <em:contributor>Fr Contributor 2</em:contributor>
- <em:contributor>Fr Contributor 3</em:contributor>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="de-DE">
- <em:name>de-DE Name</em:name>
- </Description>
- </em:localized>
-
- <em:localized>
- <Description em:locale="es-ES">
- <em:name>es-ES Name</em:name>
- <em:description>es-ES Description</em:description>
- </Description>
- </em:localized>
-
- <!-- Subsequent definitions for the same locale should be ignored -->
- <em:localized>
- <Description em:locale="fr-FR">
- <em:name>Repeated locale</em:name>
- </Description>
- </em:localized>
-
- <!-- Properties with no listed locale should be ignored -->
- <em:localized>
- <Description>
- <em:name>Missing locale</em:name>
- </Description>
- </em:localized>
-
- <!-- Front End MetaData -->
- <em:name>Fallback Name</em:name>
- <em:description>Fallback Description</em:description>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf b/toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf
deleted file mode 100644
index 09655c2a6..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_locked2_5/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon5@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 5</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf b/toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf
deleted file mode 100644
index 75f110d2a..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_locked2_6/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon6@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 6</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf b/toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf
deleted file mode 100644
index 5924982f7..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate4_6/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon6@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 6</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf b/toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf
deleted file mode 100644
index 072751cf2..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate4_7/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon7@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 7</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf b/toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf
deleted file mode 100644
index ff8280ae3..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate6/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon6@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 6</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf b/toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf
deleted file mode 100644
index fd1df0e08..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate7/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon7@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 7</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>true</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest b/toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest
deleted file mode 100644
index 8570bae82..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate8/chrome.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-content test-addon-1 chrome/content
-
- locale test-addon-1 en-US locale/en-US
- locale test-addon-1 fr-FR locale/fr-FR
-overlay chrome://browser/content/browser.xul chrome://test-addon-1/content/overlay.xul
-binary-component components/something.so
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf b/toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf
deleted file mode 100644
index 61ed24763..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate8/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon8@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 8</em:name>
- <em:description>Test Description</em:description>
- <em:unpack>true</em:unpack>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf b/toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf
deleted file mode 100644
index 116dd0176..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_migrate9/install.rdf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon9@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:internalName>theme1/1.0</em:internalName>
-
- <!-- Front End MetaData -->
- <em:name>Test Theme 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:skinnable>true</em:skinnable>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js
deleted file mode 100644
index 4eb8b4875..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_symbol/bootstrap.js
+++ /dev/null
@@ -1,62 +0,0 @@
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
-
-const PASS_PREF = "symboltest.instanceid.pass";
-const FAIL_BOGUS_PREF = "symboltest.instanceid.fail_bogus";
-const FAIL_ID_PREF = "symboltest.instanceid.fail_bogus";
-const ADDON_ID = "test_symbol@tests.mozilla.org";
-
-function install(data, reason) {}
-
-// normally we would use BootstrapMonitor here, but we need a reference to
-// the symbol inside `XPIProvider.jsm`.
-function startup(data, reason) {
- Services.prefs.setBoolPref(PASS_PREF, false);
- Services.prefs.setBoolPref(FAIL_BOGUS_PREF, false);
- Services.prefs.setBoolPref(FAIL_ID_PREF, false);
-
- // test with the correct symbol
- if (data.hasOwnProperty("instanceID") && data.instanceID) {
- AddonManager.getAddonByInstanceID(data.instanceID)
- .then(addon => {
- if (addon.id == ADDON_ID) {
- Services.prefs.setBoolPref(PASS_PREF, true);
- }
- }).catch(err => {
- throw Error("no addon found for symbol");
- });
-
- }
-
- // test with a totally bogus symbol
- AddonManager.getAddonByInstanceID(Symbol("bad symbol"))
- .then(addon => {
- // there is no symbol by this name, so null should be returned
- if (addon == null) {
- Services.prefs.setBoolPref(FAIL_BOGUS_PREF, true);
- } else {
- throw Error("bad symbol should not match:", addon);
- }
- }).catch(err => {
- throw Error("promise should not have rejected: " + err);
- });
-
- // try to make a matching symbol - this should fail because it's not a
- // reference to the same symbol stored inside the addons manager.
- AddonManager.getAddonByInstanceID(Symbol(ADDON_ID))
- .then(addon => {
- // there is no symbol by this name, so null should be returned
- if (addon == null) {
- Services.prefs.setBoolPref(FAIL_ID_PREF, true);
- } else {
- throw Error("bad symbol should not match:", addon);
- }
- }).catch(err => {
- throw Error("promise should not have rejected: " + err);
- });
-
-}
-
-function shutdown(data, reason) {}
-
-function uninstall(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf b/toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf
deleted file mode 100644
index adccda552..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_symbol/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>test_symbol@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Symbol</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_theme/install.rdf b/toolkit/mozapps/extensions/test/addons/test_theme/install.rdf
deleted file mode 100644
index e1a37d0a4..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_theme/install.rdf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>theme1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:internalName>theme1/1.0</em:internalName>
-
- <!-- Front End MetaData -->
- <em:name>Test Theme 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <em:skinnable>true</em:skinnable>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_theme/preview.png b/toolkit/mozapps/extensions/test/addons/test_theme/preview.png
deleted file mode 100644
index 321ce47cf..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_theme/preview.png
+++ /dev/null
@@ -1 +0,0 @@
-Fake preview image
diff --git a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf b/toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf
deleted file mode 100644
index b038ebc51..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_undoincompatible/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>incompatible@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Incompatible Addon</em:name>
- <em:description>I am incompatible</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>2</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js
deleted file mode 100644
index 1666f2972..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/bootstrap.js
+++ /dev/null
@@ -1 +0,0 @@
-Components.utils.import("resource://xpcshell-data/BootstrapMonitor.jsm").monitor(this);
diff --git a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf
deleted file mode 100644
index 4178fe929..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_undouninstall1/install.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>undouninstall1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:bootstrap>true</em:bootstrap>
-
- <!-- Front End MetaData -->
- <em:name>Test Bootstrap 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:iconURL>chrome://foo/skin/icon.png</em:iconURL>
- <em:aboutURL>chrome://foo/content/about.xul</em:aboutURL>
- <em:optionsURL>chrome://foo/content/options.xul</em:optionsURL>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_update/install.rdf b/toolkit/mozapps/extensions/test/addons/test_update/install.rdf
deleted file mode 100644
index 801a35a8f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 1</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_update12/install.rdf b/toolkit/mozapps/extensions/test/addons/test_update12/install.rdf
deleted file mode 100644
index 3589cb55c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update12/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon12@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 12</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_update8/install.rdf b/toolkit/mozapps/extensions/test/addons/test_update8/install.rdf
deleted file mode 100644
index 43e31af42..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update8/install.rdf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>addon8@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <!-- Front End MetaData -->
- <em:name>Test 8</em:name>
- <em:description>Test Description</em:description>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js
deleted file mode 100644
index 24c778c09..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi1/bootstrap.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-function install(data, reason) {}
-function startup(data, reason) {}
-function shutdown(data, reason) {}
-function uninstall(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf
deleted file mode 100644
index 9f955562c..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi1/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-<Description about="urn:mozilla:install-manifest">
- <em:id>updatemulti@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:updateURL>http://localhost:4444/data/test_update_multi.rdf</em:updateURL>
- <em:bootstrap>true</em:bootstrap>
- <em:name>Test Addon 1</em:name>
-<em:targetApplication><Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
-</Description></em:targetApplication>
-</Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi b/toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi
deleted file mode 100644
index febff06fa..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi2/addon.xpi
+++ /dev/null
Binary files differ
diff --git a/toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf
deleted file mode 100644
index 44bdb05ba..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_update_multi2/install.rdf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-<Description about="urn:mozilla:install-manifest">
- <em:id>updatemulti@tests.mozilla.org</em:id>
- <em:type>32</em:type>
- <em:version>2.0</em:version>
-</Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js
deleted file mode 100644
index 24c778c09..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_updateid1/bootstrap.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-function install(data, reason) {}
-function startup(data, reason) {}
-function shutdown(data, reason) {}
-function uninstall(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf b/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf
deleted file mode 100644
index 803b64e5f..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_updateid1/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-<Description about="urn:mozilla:install-manifest">
- <em:id>addon1@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
- <em:updateURL>http://localhost:4444/data/test_updateid.rdf</em:updateURL>
- <em:bootstrap>true</em:bootstrap>
- <em:name>Test Addon 1</em:name>
-<em:targetApplication><Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
-</Description></em:targetApplication>
-</Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js
deleted file mode 100644
index 24c778c09..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_updateid2/bootstrap.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-function install(data, reason) {}
-function startup(data, reason) {}
-function shutdown(data, reason) {}
-function uninstall(data, reason) {}
diff --git a/toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf b/toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf
deleted file mode 100644
index 041af57f0..000000000
--- a/toolkit/mozapps/extensions/test/addons/test_updateid2/install.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-<Description about="urn:mozilla:install-manifest">
- <em:id>addon1.changed@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
- <em:updateURL>http://localhost:4444/data/test_updateid.rdf</em:updateURL>
- <em:bootstrap>true</em:bootstrap>
- <em:name>Test Addon 1</em:name>
-<em:targetApplication><Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
-</Description></em:targetApplication>
-</Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf b/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf
deleted file mode 100644
index 76e662977..000000000
--- a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_1/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>upgradeable1x2-3@tests.mozilla.org</em:id>
- <em:version>1.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>2</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test min 1 max 2 upgrade to 3</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf b/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf
deleted file mode 100644
index e57672c42..000000000
--- a/toolkit/mozapps/extensions/test/addons/upgradeable1x2-3_2/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>upgradeable1x2-3@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>3</em:minVersion>
- <em:maxVersion>3</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Test min 1 max 2 upgrade to 3</em:name>
-
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest b/toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest
deleted file mode 100644
index 16108ce18..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_1/chrome.manifest
+++ /dev/null
@@ -1 +0,0 @@
-content webex ./
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json b/toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json
deleted file mode 100644
index 2ca5f40f7..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_1/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "name": "Web Extension Name",
- "version": "1.0",
- "manifest_version": 2,
- "applications": {
- "gecko": {
- "id": "webextension1@tests.mozilla.org"
- }
- },
- "icons": {
- "48": "icon48.png",
- "64": "icon64.png"
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf b/toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf
deleted file mode 100644
index 653481ed0..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_2/install.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>first-webextension2@tests.mozilla.org</em:id>
- <em:version>2.0</em:version>
-
- <em:targetApplication>
- <Description>
- <em:id>xpcshell@tests.mozilla.org</em:id>
- <em:minVersion>1</em:minVersion>
- <em:maxVersion>1</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>XPI Add-on 1</em:name>
- <em:description>XPI Add-on 1 - Description</em:description>
- <em:creator>XPI Add-on 1 - Creator</em:creator>
- <em:developer>XPI Add-on 1 - First Developer</em:developer>
- <em:translator>XPI Add-on 1 - First Translator</em:translator>
- <em:contributor>XPI Add-on 1 - First Contributor</em:contributor>
- <em:homepageURL>http://localhost/xpi/1/homepage.html</em:homepageURL>
- <em:optionsURL>http://localhost/xpi/1/options.html</em:optionsURL>
- <em:aboutURL>http://localhost/xpi/1/about.html</em:aboutURL>
- <em:iconURL>http://localhost/xpi/1/icon.png</em:iconURL>
- </Description>
-</RDF>
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json b/toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json
deleted file mode 100644
index 5b470d430..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_2/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "Web Extension Name",
- "version": "1.0",
- "manifest_version": 2,
- "applications": {
- "gecko": {
- "id": "last-webextension2@tests.mozilla.org"
- }
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json b/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json
deleted file mode 100644
index 36868d414..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/en/messages.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": {
- "message": "foo ☹",
- "description": "foo"
- },
- "desc": {
- "message": "bar ☹",
- "description": "bar"
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json b/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json
deleted file mode 100644
index c3d02ffde..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_3/_locales/fr/messages.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": {
- "message": "le foo ☺",
- "description": "foo"
- },
- "desc": {
- "message": "le bar ☺",
- "description": "bar"
- }
-}
diff --git a/toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json b/toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json
deleted file mode 100644
index b6ae6f10f..000000000
--- a/toolkit/mozapps/extensions/test/addons/webextension_3/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "Web Extensiøn __MSG_name__",
- "description": "Descriptïon __MSG_desc__ of add-on",
- "version": "1.0",
- "manifest_version": 2,
- "default_locale": "en",
- "applications": {
- "gecko": {
- "id": "webextension3@tests.mozilla.org"
- }
- }
-}