Merge branch 'ext-work'

1 files changed, 0 insertions, 792 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js b/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
deleted file mode 100644
index 4680a3c4a..000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
+++ /dev/null
@@ -1,792 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This verifies that forcing undo for uninstall works
-
-const APP_STARTUP                     = 1;
-const APP_SHUTDOWN                    = 2;
-const ADDON_ENABLE                    = 3;
-const ADDON_DISABLE                   = 4;
-const ADDON_INSTALL                   = 5;
-const ADDON_UNINSTALL                 = 6;
-const ADDON_UPGRADE                   = 7;
-const ADDON_DOWNGRADE                 = 8;
-
-const ID = "undouninstall1@tests.mozilla.org";
-const INCOMPAT_ID = "incompatible@tests.mozilla.org";
-
-var addon1 = {
-  id: "addon1@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 1",
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "1"
-  }]
-};
-
-
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-BootstrapMonitor.init();
-
-function getStartupReason(id) {
-  let info = BootstrapMonitor.started.get(id);
-  return info ? info.reason : undefined;
-}
-
-function getShutdownReason(id) {
-  let info = BootstrapMonitor.stopped.get(id);
-  return info ? info.reason : undefined;
-}
-
-function getInstallReason(id) {
-  let info = BootstrapMonitor.installed.get(id);
-  return info ? info.reason : undefined;
-}
-
-function getUninstallReason(id) {
-  let info = BootstrapMonitor.uninstalled.get(id);
-  return info ? info.reason : undefined;
-}
-
-function getStartupOldVersion(id) {
-  let info = BootstrapMonitor.started.get(id);
-  return info ? info.data.oldVersion : undefined;
-}
-
-function getShutdownNewVersion(id) {
-  let info = BootstrapMonitor.stopped.get(id);
-  return info ? info.data.newVersion : undefined;
-}
-
-function getInstallOldVersion(id) {
-  let info = BootstrapMonitor.installed.get(id);
-  return info ? info.data.oldVersion : undefined;
-}
-
-function getUninstallNewVersion(id) {
-  let info = BootstrapMonitor.uninstalled.get(id);
-  return info ? info.data.newVersion : undefined;
-}
-
-// Sets up the profile by installing an add-on.
-function run_test() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-  startupManager();
-  do_register_cleanup(promiseShutdownManager);
-
-  run_next_test();
-}
-
-add_task(function* installAddon() {
-  let olda1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_eq(olda1, null);
-
-  writeInstallRDFForExtension(addon1, profileDir);
-  yield promiseRestartManager();
-
-  let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-  do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-  do_check_eq(a1.pendingOperations, 0);
-  do_check_in_crash_annotation(addon1.id, addon1.version);
-});
-
-// Uninstalling an add-on should work.
-add_task(function* uninstallAddon() {
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-
-  let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_eq(a1.pendingOperations, 0);
-  do_check_neq(a1.operationsRequiringRestart &
-               AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0);
-  a1.uninstall(true);
-  do_check_true(hasFlag(a1.pendingOperations, AddonManager.PENDING_UNINSTALL));
-  do_check_in_crash_annotation(addon1.id, addon1.version);
-
-  ensure_test_completed();
-
-  let list = yield promiseAddonsWithOperationsByTypes(null);
-
-  do_check_eq(list.length, 1);
-  do_check_eq(list[0].id, "addon1@tests.mozilla.org");
-
-  yield promiseRestartManager();
-
-  a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_eq(a1, null);
-  do_check_false(isExtensionInAddonsList(profileDir, "addon1@tests.mozilla.org"));
-  do_check_not_in_crash_annotation(addon1.id, addon1.version);
-
-  var dest = profileDir.clone();
-  dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
-  do_check_false(dest.exists());
-  writeInstallRDFForExtension(addon1, profileDir);
-  yield promiseRestartManager();
-});
-
-// Cancelling the uninstall should send onOperationCancelled
-add_task(function* cancelUninstall() {
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-
-  let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-  do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-  do_check_eq(a1.pendingOperations, 0);
-  a1.uninstall(true);
-  do_check_true(hasFlag(a1.pendingOperations, AddonManager.PENDING_UNINSTALL));
-
-  ensure_test_completed();
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  do_check_eq(a1.pendingOperations, 0);
-
-  ensure_test_completed();
-  yield promiseRestartManager();
-
-  a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-  do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-});
-
-// Uninstalling an item pending disable should still require a restart
-add_task(function* pendingDisableRequestRestart() {
-  let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onDisabling"
-    ]
-  });
-  a1.userDisabled = true;
-  ensure_test_completed();
-
-  do_check_true(hasFlag(AddonManager.PENDING_DISABLE, a1.pendingOperations));
-  do_check_true(a1.isActive);
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  ensure_test_completed();
-  do_check_true(hasFlag(AddonManager.PENDING_DISABLE, a1.pendingOperations));
-
-  yield promiseRestartManager();
-});
-
-// Test that uninstalling an inactive item should still allow cancelling
-add_task(function* uninstallInactiveIsCancellable() {
-  let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-  do_check_false(isExtensionInAddonsList(profileDir, a1.id));
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  ensure_test_completed();
-
-  yield promiseRestartManager();
-});
-
-// Test that an inactive item can be uninstalled
-add_task(function* uninstallInactive() {
-  let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-  do_check_false(isExtensionInAddonsList(profileDir, a1.id));
-
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      [ "onUninstalling", false ],
-      "onUninstalled"
-    ]
-  });
-  a1.uninstall();
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
-  do_check_eq(a1, null);
-});
-
-// Tests that an enabled restartless add-on can be uninstalled and goes away
-// when the uninstall is committed
-add_task(function* uninstallRestartless() {
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      ["onInstalling", false],
-      "onInstalled"
-    ]
-  }, [
-    "onNewInstall",
-    "onInstallStarted",
-    "onInstallEnded"
-  ]);
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-  ensure_test_completed();
-
-  let a1 = yield promiseAddonByID(ID);
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID(ID);
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_eq(getShutdownReason(ID), ADDON_UNINSTALL);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  // complete the uinstall
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalled"
-    ]
-  });
-  a1.uninstall();
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID(ID);
-
-  do_check_eq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-});
-
-// Tests that an enabled restartless add-on can be uninstalled and then cancelled
-add_task(function* cancelUninstallOfRestartless() {
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      ["onInstalling", false],
-      "onInstalled"
-    ]
-  }, [
-    "onNewInstall",
-    "onInstallStarted",
-    "onInstallEnded"
-  ]);
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-  ensure_test_completed();
-
-  let a1 = yield promiseAddonByID(ID);
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_eq(getShutdownReason(ID), ADDON_UNINSTALL);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  ensure_test_completed();
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  shutdownManager();
-
-  do_check_eq(getShutdownReason(ID), APP_SHUTDOWN);
-  do_check_eq(getShutdownNewVersion(ID), undefined);
-
-  startupManager(false);
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getStartupReason(ID), APP_STARTUP);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  a1.uninstall();
-});
-
-// Tests that reinstalling an enabled restartless add-on waiting to be
-// uninstalled aborts the uninstall and leaves the add-on enabled
-add_task(function* reinstallAddonAwaitingUninstall() {
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-
-  let a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_eq(getShutdownReason(ID), ADDON_UNINSTALL);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      ["onInstalling", false],
-      "onInstalled"
-    ]
-  }, [
-    "onNewInstall",
-    "onInstallStarted",
-    "onInstallEnded"
-  ]);
-
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  ensure_test_completed();
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getUninstallReason(ID), ADDON_DOWNGRADE);
-  do_check_eq(getInstallReason(ID), ADDON_DOWNGRADE);
-  do_check_eq(getStartupReason(ID), ADDON_DOWNGRADE);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  shutdownManager();
-
-  do_check_eq(getShutdownReason(ID), APP_SHUTDOWN);
-
-  startupManager(false);
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getStartupReason(ID), APP_STARTUP);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  a1.uninstall();
-});
-
-// Tests that a disabled restartless add-on can be uninstalled and goes away
-// when the uninstall is committed
-add_task(function* uninstallDisabledRestartless() {
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-
-  let a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  a1.userDisabled = true;
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_eq(getShutdownReason(ID), ADDON_DISABLE);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  // commit the uninstall
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalled"
-    ]
-  });
-  a1.uninstall();
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_eq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  BootstrapMonitor.checkAddonNotInstalled(ID);
-  do_check_eq(getUninstallReason(ID), ADDON_UNINSTALL);
-});
-
-// Tests that a disabled restartless add-on can be uninstalled and then cancelled
-add_task(function* cancelUninstallDisabledRestartless() {
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      ["onInstalling", false],
-      "onInstalled"
-    ]
-  }, [
-    "onNewInstall",
-    "onInstallStarted",
-    "onInstallEnded"
-  ]);
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-  ensure_test_completed();
-
-  let a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      ["onDisabling", false],
-      "onDisabled"
-    ]
-  });
-  a1.userDisabled = true;
-  ensure_test_completed();
-
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_eq(getShutdownReason(ID), ADDON_DISABLE);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  BootstrapMonitor.checkAddonInstalled(ID);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  ensure_test_completed();
-
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  BootstrapMonitor.checkAddonInstalled(ID);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  yield promiseRestartManager();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  BootstrapMonitor.checkAddonInstalled(ID);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  a1.uninstall();
-});
-
-// Tests that reinstalling a disabled restartless add-on waiting to be
-// uninstalled aborts the uninstall and leaves the add-on disabled
-add_task(function* reinstallDisabledAddonAwaitingUninstall() {
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-
-  let a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_INSTALL);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  a1.userDisabled = true;
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_eq(getShutdownReason(ID), ADDON_DISABLE);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      ["onInstalling", false],
-      "onInstalled"
-    ]
-  }, [
-    "onNewInstall",
-    "onInstallStarted",
-    "onInstallEnded"
-  ]);
-
-  yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  ensure_test_completed();
-
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonNotStarted(ID, "1.0");
-  do_check_eq(getUninstallReason(ID), ADDON_DOWNGRADE);
-  do_check_eq(getInstallReason(ID), ADDON_DOWNGRADE);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  yield promiseRestartManager();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(ID, "1.0");
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_false(a1.isActive);
-  do_check_true(a1.userDisabled);
-
-  a1.uninstall();
-});
-
-
-// Test that uninstalling a temporary addon can be canceled
-add_task(function* cancelUninstallTemporary() {
-  yield AddonManager.installTemporaryAddon(do_get_addon("test_undouninstall1"));
-
-  let a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonInstalled(ID, "1.0");
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(getInstallReason(ID), ADDON_INSTALL);
-  do_check_eq(getStartupReason(ID), ADDON_ENABLE);
-  do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
-  do_check_true(a1.isActive);
-  do_check_false(a1.userDisabled);
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  BootstrapMonitor.checkAddonNotStarted(ID, "1.0");
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-
-  prepare_test({
-    "undouninstall1@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
-
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonStarted(ID, "1.0");
-  do_check_eq(a1.pendingOperations, 0);
-
-  yield promiseRestartManager();
-});
-
-// Tests that cancelling the uninstall of an incompatible restartless addon
-// does not start the addon
-add_task(function* cancelUninstallIncompatibleRestartless() {
-  yield promiseInstallAllFiles([do_get_addon("test_undoincompatible")]);
-
-  let a1 = yield promiseAddonByID(INCOMPAT_ID);
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(INCOMPAT_ID);
-  do_check_false(a1.isActive);
-
-  prepare_test({
-    "incompatible@tests.mozilla.org": [
-      "onUninstalling"
-    ]
-  });
-  a1.uninstall(true);
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID(INCOMPAT_ID);
-  do_check_neq(a1, null);
-  do_check_true(hasFlag(AddonManager.PENDING_UNINSTALL, a1.pendingOperations));
-  do_check_false(a1.isActive);
-
-  prepare_test({
-    "incompatible@tests.mozilla.org": [
-      "onOperationCancelled"
-    ]
-  });
-  a1.cancelUninstall();
-  ensure_test_completed();
-
-  a1 = yield promiseAddonByID(INCOMPAT_ID);
-  do_check_neq(a1, null);
-  BootstrapMonitor.checkAddonNotStarted(INCOMPAT_ID);
-  do_check_eq(a1.pendingOperations, 0);
-  do_check_false(a1.isActive);
-});