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

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

1 files changed, 0 insertions, 40 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js
deleted file mode 100644
index d17e7acde..000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug740612.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This verifies that attempts to override the global values fails but doesn't
-// destroy the world with it
-createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-function getActiveVersion() {
-  return Services.prefs.getIntPref("bootstraptest.active_version");
-}
-
-function getInstalledVersion() {
-  return Services.prefs.getIntPref("bootstraptest.installed_version");
-}
-
-function run_test() {
-  do_test_pending();
-
-  manuallyInstall(do_get_addon("test_bug740612_1"), profileDir,
-                  "bug740612_1@tests.mozilla.org");
-  manuallyInstall(do_get_addon("test_bug740612_2"), profileDir,
-                  "bug740612_2@tests.mozilla.org");
-
-  startupManager();
-
-  AddonManager.getAddonsByIDs(["bug740612_1@tests.mozilla.org",
-                               "bug740612_2@tests.mozilla.org"],
-                               function([a1, a2]) {
-    do_check_neq(a1, null);
-    do_check_neq(a2, null);
-    do_check_eq(getInstalledVersion(), "1.0");
-    do_check_eq(getActiveVersion(), "1.0");
-
-    do_execute_soon(do_test_finished);
-  });
-}