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

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

1 files changed, 0 insertions, 115 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js b/toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js
deleted file mode 100644
index 05647f807..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_safemode.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-Components.utils.import("resource://gre/modules/NetUtil.jsm");
-
-// Tests that extensions behave correctly in safe mode
-
-var addon1 = {
-  id: "addon1@tests.mozilla.org",
-  version: "1.0",
-  name: "Test 1",
-  optionsURL: "chrome://foo/content/options.xul",
-  aboutURL: "chrome://foo/content/about.xul",
-  iconURL: "chrome://foo/content/icon.png",
-  targetApplications: [{
-    id: "xpcshell@tests.mozilla.org",
-    minVersion: "1",
-    maxVersion: "1"
-  }]
-};
-
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-var gIconURL = null;
-
-// Sets up the profile by installing an add-on.
-function run_test() {
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-  gAppInfo.inSafeMode = true;
-
-  startupManager();
-
-  AddonManager.getAddonByID("addon1@tests.mozilla.org", callback_soon(function(a1) {
-    do_check_eq(a1, null);
-    do_check_not_in_crash_annotation(addon1.id, addon1.version);
-
-    writeInstallRDFForExtension(addon1, profileDir, addon1.id, "icon.png");
-    gIconURL = do_get_addon_root_uri(profileDir.clone(), addon1.id) + "icon.png";
-
-    restartManager();
-
-    AddonManager.getAddonByID("addon1@tests.mozilla.org", function(newa1) {
-      do_check_neq(newa1, null);
-      do_check_false(newa1.isActive);
-      do_check_false(newa1.userDisabled);
-      do_check_eq(newa1.aboutURL, null);
-      do_check_eq(newa1.optionsURL, null);
-      do_check_eq(newa1.iconURL, gIconURL);
-      do_check_true(isExtensionInAddonsList(profileDir, newa1.id));
-      do_check_true(hasFlag(newa1.permissions, AddonManager.PERM_CAN_DISABLE));
-      do_check_false(hasFlag(newa1.permissions, AddonManager.PERM_CAN_ENABLE));
-      do_check_eq(newa1.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_NONE);
-      do_check_not_in_crash_annotation(addon1.id, addon1.version);
-
-      run_test_1();
-    });
-  }));
-}
-
-// Disabling an add-on should work
-function run_test_1() {
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      ["onDisabling", false],
-      "onDisabled"
-    ]
-  });
-
-  AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
-    do_check_false(hasFlag(a1.operationsRequiringRestart,
-                           AddonManager.OP_NEEDS_RESTART_DISABLE));
-    a1.userDisabled = true;
-    do_check_false(a1.isActive);
-    do_check_eq(a1.aboutURL, null);
-    do_check_eq(a1.optionsURL, null);
-    do_check_eq(a1.iconURL, gIconURL);
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_DISABLE));
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_ENABLE));
-    do_check_eq(a1.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_NONE);
-    do_check_not_in_crash_annotation(addon1.id, addon1.version);
-
-    ensure_test_completed();
-
-    run_test_2();
-  });
-}
-
-// Enabling an add-on should happen without restart but not become active.
-function run_test_2() {
-  prepare_test({
-    "addon1@tests.mozilla.org": [
-      ["onEnabling", false],
-      "onEnabled"
-    ]
-  });
-
-  AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
-    a1.userDisabled = false;
-    do_check_false(a1.isActive);
-    do_check_eq(a1.aboutURL, null);
-    do_check_eq(a1.optionsURL, null);
-    do_check_eq(a1.iconURL, gIconURL);
-    do_check_true(hasFlag(a1.permissions, AddonManager.PERM_CAN_DISABLE));
-    do_check_false(hasFlag(a1.permissions, AddonManager.PERM_CAN_ENABLE));
-    do_check_eq(a1.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_NONE);
-    do_check_not_in_crash_annotation(addon1.id, addon1.version);
-
-    ensure_test_completed();
-
-    do_execute_soon(do_test_finished);
-  });
-}