Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 932 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_startup.js b/toolkit/mozapps/webextensions/test/xpcshell/test_startup.js
deleted file mode 100644
index fdd00c1ad..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_startup.js
+++ /dev/null
@@ -1,932 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This verifies startup detection of added/removed/changed items and install
-// location priorities
-
-// Enable loading extensions from the user and system scopes
-Services.prefs.setIntPref("extensions.enabledScopes",
-                          AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER +
-                          AddonManager.SCOPE_SYSTEM);
-
-var addon1 = {
-  id: "addon1@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 1",
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "1"
-  }, {                 // Repeated target application entries should be ignored
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "2",
-    maxVersion: "2"
-  }]
-};
-
-var addon2 = {
-  id: "addon2@tests.mozilla.org",
-  version: "2.0",
-  name: "Test 2",
-  targetApplications: [{  // Bad target application entries should be ignored
-    minVersion: "3",
-    maxVersion: "4"
-  }, {
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "2"
-  }]
-};
-
-var addon3 = {
-  id: "addon3@tests.mozilla.org",
-  version: "3.0",
-  name: "Test 3",
-  targetApplications: [{
-    id: "toolkit@mozilla.org",
-    minVersion: "1.9.2",
-    maxVersion: "1.9.2.*"
-  }]
-};
-
-// Should be ignored because it has no ID
-var addon4 = {
-  version: "4.0",
-  name: "Test 4",
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "1"
-  }]
-};
-
-// Should be ignored because it has no version
-var addon5 = {
-  id: "addon5@tests.mozilla.org",
-  name: "Test 5",
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "1"
-  }]
-};
-
-// Should be ignored because it has an invalid type
-var addon6 = {
-  id: "addon6@tests.mozilla.org",
-  version: "3.0",
-  name: "Test 6",
-  type: 5,
-  targetApplications: [{
-    id: "toolkit@mozilla.org",
-    minVersion: "1.9.2",
-    maxVersion: "1.9.2.*"
-  }]
-};
-
-// Should be ignored because it has an invalid type
-var addon7 = {
-  id: "addon7@tests.mozilla.org",
-  version: "3.0",
-  name: "Test 3",
-  type: "extension",
-  targetApplications: [{
-    id: "toolkit@mozilla.org",
-    minVersion: "1.9.2",
-    maxVersion: "1.9.2.*"
-  }]
-};
-
-createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-const globalDir = gProfD.clone();
-globalDir.append("extensions2");
-globalDir.append(gAppInfo.ID);
-registerDirectory("XRESysSExtPD", globalDir.parent);
-const userDir = gProfD.clone();
-userDir.append("extensions3");
-userDir.append(gAppInfo.ID);
-registerDirectory("XREUSysExt", userDir.parent);
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-var gCachePurged = false;
-
-// Set up the profile
-function run_test() {
-  do_test_pending("test_startup main");
-
-  let obs = AM_Cc["@mozilla.org/observer-service;1"].
-    getService(AM_Ci.nsIObserverService);
-  obs.addObserver({
-    observe: function(aSubject, aTopic, aData) {
-      gCachePurged = true;
-    }
-  }, "startupcache-invalidate", false);
-
-  startupManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-
-  do_check_false(gExtensionsJSON.exists());
-
-  do_check_false(gExtensionsINI.exists());
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org",
-                               "addon6@tests.mozilla.org",
-                               "addon7@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5, a6, a7]) {
-
-    do_check_eq(a1, null);
-    do_check_not_in_crash_annotation(addon1.id, addon1.version);
-    do_check_eq(a2, null);
-    do_check_not_in_crash_annotation(addon2.id, addon2.version);
-    do_check_eq(a3, null);
-    do_check_not_in_crash_annotation(addon3.id, addon3.version);
-    do_check_eq(a4, null);
-    do_check_eq(a5, null);
-
-    do_execute_soon(run_test_1);
-  });
-}
-
-function end_test() {
-  do_test_finished("test_startup main");
-}
-
-// Try to install all the items into the profile
-function run_test_1() {
-  writeInstallRDFForExtension(addon1, profileDir);
-  var dest = writeInstallRDFForExtension(addon2, profileDir);
-  // Attempt to make this look like it was added some time in the past so
-  // the change in run_test_2 makes the last modified time change.
-  setExtensionModifiedTime(dest, dest.lastModifiedTime - 5000);
-
-  writeInstallRDFForExtension(addon3, profileDir);
-  writeInstallRDFForExtension(addon4, profileDir, "addon4@tests.mozilla.org");
-  writeInstallRDFForExtension(addon5, profileDir);
-  writeInstallRDFForExtension(addon6, profileDir);
-  writeInstallRDFForExtension(addon7, profileDir);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, ["addon1@tests.mozilla.org",
-                                      "addon2@tests.mozilla.org",
-                                      "addon3@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  do_print("Checking for " + gExtensionsINI.path);
-  do_check_true(gExtensionsINI.exists());
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org",
-                               "addon6@tests.mozilla.org",
-                               "addon7@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5, a6, a7]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_neq(a1.syncGUID, null);
-    do_check_true(a1.syncGUID.length >= 9);
-    do_check_eq(a1.version, "1.0");
-    do_check_eq(a1.name, "Test 1");
-    do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, addon1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_PROFILE);
-    do_check_eq(a1.sourceURI, null);
-    do_check_true(a1.foreignInstall);
-    do_check_false(a1.userDisabled);
-    do_check_true(a1.seen);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_neq(a2.syncGUID, null);
-    do_check_true(a2.syncGUID.length >= 9);
-    do_check_eq(a2.version, "2.0");
-    do_check_eq(a2.name, "Test 2");
-    do_check_true(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, addon2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_PROFILE);
-    do_check_eq(a2.sourceURI, null);
-    do_check_true(a2.foreignInstall);
-    do_check_false(a1.userDisabled);
-    do_check_true(a1.seen);
-
-    do_check_neq(a3, null);
-    do_check_eq(a3.id, "addon3@tests.mozilla.org");
-    do_check_neq(a3.syncGUID, null);
-    do_check_true(a3.syncGUID.length >= 9);
-    do_check_eq(a3.version, "3.0");
-    do_check_eq(a3.name, "Test 3");
-    do_check_true(isExtensionInAddonsList(profileDir, a3.id));
-    do_check_true(hasFlag(a3.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a3.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon3.id, addon3.version);
-    do_check_eq(a3.scope, AddonManager.SCOPE_PROFILE);
-    do_check_eq(a3.sourceURI, null);
-    do_check_true(a3.foreignInstall);
-    do_check_false(a1.userDisabled);
-    do_check_true(a1.seen);
-
-    do_check_eq(a4, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-    dest = profileDir.clone();
-    dest.append(do_get_expected_addon_name("addon4@tests.mozilla.org"));
-    do_check_false(dest.exists());
-
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-    dest = profileDir.clone();
-    dest.append(do_get_expected_addon_name("addon5@tests.mozilla.org"));
-    do_check_false(dest.exists());
-
-    do_check_eq(a6, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon6@tests.mozilla.org"));
-    dest = profileDir.clone();
-    dest.append(do_get_expected_addon_name("addon6@tests.mozilla.org"));
-    do_check_false(dest.exists());
-
-    do_check_eq(a7, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon7@tests.mozilla.org"));
-    dest = profileDir.clone();
-    dest.append(do_get_expected_addon_name("addon7@tests.mozilla.org"));
-    do_check_false(dest.exists());
-
-    AddonManager.getAddonsByTypes(["extension"], function(extensionAddons) {
-      do_check_eq(extensionAddons.length, 3);
-
-      do_execute_soon(run_test_2);
-    });
-  });
-}
-
-// Test that modified items are detected and items in other install locations
-// are ignored
-function run_test_2() {
-  addon1.version = "1.1";
-  writeInstallRDFForExtension(addon1, userDir);
-  addon2.version="2.1";
-  writeInstallRDFForExtension(addon2, profileDir);
-  addon2.version="2.2";
-  writeInstallRDFForExtension(addon2, globalDir);
-  addon2.version="2.3";
-  writeInstallRDFForExtension(addon2, userDir);
-  var dest = profileDir.clone();
-  dest.append(do_get_expected_addon_name("addon3@tests.mozilla.org"));
-  dest.remove(true);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, ["addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, ["addon3@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  do_check_true(gExtensionsINI.exists());
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.0");
-    do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_false(isExtensionInAddonsList(userDir, a1.id));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, a1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_PROFILE);
-    do_check_true(a1.foreignInstall);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.1");
-    do_check_true(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_false(isExtensionInAddonsList(userDir, a2.id));
-    do_check_false(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, a2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_PROFILE);
-    do_check_true(a2.foreignInstall);
-
-    do_check_eq(a3, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon3@tests.mozilla.org"));
-    do_check_not_in_crash_annotation(addon3.id, addon3.version);
-
-    do_check_eq(a4, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-
-    do_execute_soon(run_test_3);
-  });
-}
-
-// Check that removing items from the profile reveals their hidden versions.
-function run_test_3() {
-  var dest = profileDir.clone();
-  dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-  dest.remove(true);
-  dest = profileDir.clone();
-  dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
-  dest.remove(true);
-  writeInstallRDFForExtension(addon3, profileDir, "addon4@tests.mozilla.org");
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, ["addon1@tests.mozilla.org",
-                                    "addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.1");
-    do_check_false(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_true(isExtensionInAddonsList(userDir, a1.id));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, a1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_USER);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.3");
-    do_check_false(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_true(isExtensionInAddonsList(userDir, a2.id));
-    do_check_false(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, a2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_USER);
-
-    do_check_eq(a3, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon3@tests.mozilla.org"));
-
-    do_check_eq(a4, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-
-    dest = profileDir.clone();
-    dest.append(do_get_expected_addon_name("addon4@tests.mozilla.org"));
-    do_check_false(dest.exists());
-
-    do_execute_soon(run_test_4);
-  });
-}
-
-// Test that disabling an install location works
-function run_test_4() {
-  Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_SYSTEM);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, ["addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, ["addon1@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_eq(a1, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon1@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon1@tests.mozilla.org"));
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.2");
-    do_check_false(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_false(isExtensionInAddonsList(userDir, a2.id));
-    do_check_true(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, a2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_SYSTEM);
-
-    do_execute_soon(run_test_5);
-  });
-}
-
-// Switching disabled locations works
-function run_test_5() {
-  Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_USER);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, ["addon1@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, ["addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.1");
-    do_check_false(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_true(isExtensionInAddonsList(userDir, a1.id));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, a1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_USER);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.3");
-    do_check_false(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_true(isExtensionInAddonsList(userDir, a2.id));
-    do_check_false(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, a2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_USER);
-
-    do_execute_soon(run_test_6);
-  });
-}
-
-// Resetting the pref makes everything visible again
-function run_test_6() {
-  Services.prefs.clearUserPref("extensions.enabledScopes");
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.1");
-    do_check_false(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_true(isExtensionInAddonsList(userDir, a1.id));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, a1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_USER);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.3");
-    do_check_false(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_true(isExtensionInAddonsList(userDir, a2.id));
-    do_check_false(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, a2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_USER);
-
-    do_execute_soon(run_test_7);
-  });
-}
-
-// Check that items in the profile hide the others again.
-function run_test_7() {
-  addon1.version = "1.2";
-  writeInstallRDFForExtension(addon1, profileDir);
-  var dest = userDir.clone();
-  dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
-  dest.remove(true);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, ["addon1@tests.mozilla.org",
-                                    "addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.2");
-    do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_false(isExtensionInAddonsList(userDir, a1.id));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, a1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_PROFILE);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.2");
-    do_check_false(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_false(isExtensionInAddonsList(userDir, a2.id));
-    do_check_true(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon2.id, a2.version);
-    do_check_eq(a2.scope, AddonManager.SCOPE_SYSTEM);
-
-    do_check_eq(a3, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon3@tests.mozilla.org"));
-
-    do_check_eq(a4, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-
-    do_execute_soon(run_test_8);
-  });
-}
-
-// Disabling all locations still leaves the profile working
-function run_test_8() {
-  Services.prefs.setIntPref("extensions.enabledScopes", 0);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, ["addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.2");
-    do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_false(isExtensionInAddonsList(userDir, a1.id));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_in_crash_annotation(addon1.id, a1.version);
-    do_check_eq(a1.scope, AddonManager.SCOPE_PROFILE);
-
-    do_check_eq(a2, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon2@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon2@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(globalDir, "addon2@tests.mozilla.org"));
-
-    do_execute_soon(run_test_9);
-  });
-}
-
-// More hiding and revealing
-function run_test_9() {
-  Services.prefs.clearUserPref("extensions.enabledScopes", 0);
-
-  var dest = userDir.clone();
-  dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-  dest.remove(true);
-  dest = globalDir.clone();
-  dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
-  dest.remove(true);
-  addon2.version = "2.4";
-  writeInstallRDFForExtension(addon2, profileDir);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, ["addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.2");
-    do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_false(isExtensionInAddonsList(userDir, a1.id));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_eq(a1.scope, AddonManager.SCOPE_PROFILE);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.4");
-    do_check_true(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_false(isExtensionInAddonsList(userDir, a2.id));
-    do_check_false(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_eq(a2.scope, AddonManager.SCOPE_PROFILE);
-
-    do_check_eq(a3, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon3@tests.mozilla.org"));
-
-    do_check_eq(a4, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-
-    do_execute_soon(run_test_10);
-  });
-}
-
-// Checks that a removal from one location and an addition in another location
-// for the same item is handled
-function run_test_10() {
-  var dest = profileDir.clone();
-  dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-  dest.remove(true);
-  addon1.version = "1.3";
-  writeInstallRDFForExtension(addon1, userDir);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, ["addon1@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_neq(a1, null);
-    do_check_eq(a1.id, "addon1@tests.mozilla.org");
-    do_check_eq(a1.version, "1.3");
-    do_check_false(isExtensionInAddonsList(profileDir, a1.id));
-    do_check_true(isExtensionInAddonsList(userDir, a1.id));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_eq(a1.scope, AddonManager.SCOPE_USER);
-
-    do_check_neq(a2, null);
-    do_check_eq(a2.id, "addon2@tests.mozilla.org");
-    do_check_eq(a2.version, "2.4");
-    do_check_true(isExtensionInAddonsList(profileDir, a2.id));
-    do_check_false(isExtensionInAddonsList(userDir, a2.id));
-    do_check_false(isExtensionInAddonsList(globalDir, a2.id));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UNINSTALL));
-    do_check_true(hasFlag(a2.permissions, AddonManager.PERM_CAN_UPGRADE));
-    do_check_eq(a2.scope, AddonManager.SCOPE_PROFILE);
-
-    do_check_eq(a3, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon3@tests.mozilla.org"));
-
-    do_check_eq(a4, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-
-    do_execute_soon(run_test_11);
-  });
-}
-
-// This should remove any remaining items
-function run_test_11() {
-  var dest = userDir.clone();
-  dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-  dest.remove(true);
-  dest = profileDir.clone();
-  dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
-  dest.remove(true);
-
-  gCachePurged = false;
-  restartManager();
-  check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_CHANGED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_UNINSTALLED, ["addon1@tests.mozilla.org",
-                                        "addon2@tests.mozilla.org"]);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
-  check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
-  do_check_true(gCachePurged);
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               function([a1, a2, a3, a4, a5]) {
-
-    do_check_eq(a1, null);
-    do_check_eq(a2, null);
-    do_check_eq(a3, null);
-    do_check_eq(a4, null);
-    do_check_eq(a5, null);
-    do_check_false(isExtensionInAddonsList(profileDir, "addon1@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(profileDir, "addon2@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(profileDir, "addon3@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(profileDir, "addon4@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(profileDir, "addon5@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon1@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon2@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon3@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon4@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(userDir, "addon5@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(globalDir, "addon1@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(globalDir, "addon2@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(globalDir, "addon3@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(globalDir, "addon4@tests.mozilla.org"));
-    do_check_false(isExtensionInAddonsList(globalDir, "addon5@tests.mozilla.org"));
-    do_check_not_in_crash_annotation(addon1.id, addon1.version);
-    do_check_not_in_crash_annotation(addon2.id, addon2.version);
-
-    do_execute_soon(run_test_12);
-  });
-}
-
-// Test that auto-disabling for specific scopes works
-function run_test_12() {
-  Services.prefs.setIntPref("extensions.autoDisableScopes", AddonManager.SCOPE_USER);
-
-  writeInstallRDFForExtension(addon1, profileDir);
-  writeInstallRDFForExtension(addon2, userDir);
-  writeInstallRDFForExtension(addon3, globalDir);
-
-  restartManager();
-
-  AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                               "addon2@tests.mozilla.org",
-                               "addon3@tests.mozilla.org",
-                               "addon4@tests.mozilla.org",
-                               "addon5@tests.mozilla.org"],
-                               callback_soon(function([a1, a2, a3, a4, a5]) {
-    do_check_neq(a1, null);
-    do_check_false(a1.userDisabled);
-    do_check_true(a1.seen);
-    do_check_true(a1.isActive);
-
-    do_check_neq(a2, null);
-    do_check_true(a2.userDisabled);
-    do_check_false(a2.seen);
-    do_check_false(a2.isActive);
-
-    do_check_neq(a3, null);
-    do_check_false(a3.userDisabled);
-    do_check_true(a3.seen);
-    do_check_true(a3.isActive);
-
-    var dest = profileDir.clone();
-    dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-    dest.remove(true);
-    dest = userDir.clone();
-    dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
-    dest.remove(true);
-    dest = globalDir.clone();
-    dest.append(do_get_expected_addon_name("addon3@tests.mozilla.org"));
-    dest.remove(true);
-
-    restartManager();
-
-    Services.prefs.setIntPref("extensions.autoDisableScopes", AddonManager.SCOPE_SYSTEM);
-
-    writeInstallRDFForExtension(addon1, profileDir);
-    writeInstallRDFForExtension(addon2, userDir);
-    writeInstallRDFForExtension(addon3, globalDir);
-
-    restartManager();
-
-    AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                                 "addon2@tests.mozilla.org",
-                                 "addon3@tests.mozilla.org",
-                                 "addon4@tests.mozilla.org",
-                                 "addon5@tests.mozilla.org"],
-                                 function([a1_2, a2_2, a3_2, a4_2, a5_2]) {
-      do_check_neq(a1_2, null);
-      do_check_false(a1_2.userDisabled);
-      do_check_true(a1_2.seen);
-      do_check_true(a1_2.isActive);
-
-      do_check_neq(a2_2, null);
-      do_check_false(a2_2.userDisabled);
-      do_check_true(a2_2.seen);
-      do_check_true(a2_2.isActive);
-
-      do_check_neq(a3_2, null);
-      do_check_true(a3_2.userDisabled);
-      do_check_false(a3_2.seen);
-      do_check_false(a3_2.isActive);
-
-      var dest2 = profileDir.clone();
-      dest2.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-      dest2.remove(true);
-      dest2 = userDir.clone();
-      dest2.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
-      dest2.remove(true);
-      dest2 = globalDir.clone();
-      dest2.append(do_get_expected_addon_name("addon3@tests.mozilla.org"));
-      dest2.remove(true);
-
-      restartManager();
-
-      Services.prefs.setIntPref("extensions.autoDisableScopes", AddonManager.SCOPE_USER + AddonManager.SCOPE_SYSTEM);
-
-      writeInstallRDFForExtension(addon1, profileDir);
-      writeInstallRDFForExtension(addon2, userDir);
-      writeInstallRDFForExtension(addon3, globalDir);
-
-      restartManager();
-
-      AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
-                                   "addon2@tests.mozilla.org",
-                                   "addon3@tests.mozilla.org",
-                                   "addon4@tests.mozilla.org",
-                                   "addon5@tests.mozilla.org"],
-                                   function([a1_3, a2_3, a3_3, a4_3, a5_3]) {
-        do_check_neq(a1_3, null);
-        do_check_false(a1_3.userDisabled);
-        do_check_true(a1_3.seen);
-        do_check_true(a1_3.isActive);
-
-        do_check_neq(a2_3, null);
-        do_check_true(a2_3.userDisabled);
-        do_check_false(a2_3.seen);
-        do_check_false(a2_3.isActive);
-
-        do_check_neq(a3_3, null);
-        do_check_true(a3_3.userDisabled);
-        do_check_false(a3_3.seen);
-        do_check_false(a3_3.isActive);
-
-        do_execute_soon(end_test);
-      });
-    });
-  }));
-}