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_bug595573.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug595573.js
deleted file mode 100644
index 7e2bf7d77..000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug595573.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This tests if addons with UUID based ids install and stay installed
-
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-function run_test() {
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-  startupManager();
-  run_test_1();
-}
-
-function run_test_1() {
-  installAllFiles([do_get_addon("test_bug595573")], function() {
-    restartManager();
-
-    AddonManager.getAddonByID("{2f69dacd-03df-4150-a9f1-e8a7b2748829}", function(a1) {
-      do_check_neq(a1, null);
-      do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-
-      do_execute_soon(run_test_2);
-    });
-  });
-}
-
-function run_test_2() {
-  restartManager();
-
-  AddonManager.getAddonByID("{2f69dacd-03df-4150-a9f1-e8a7b2748829}", function(a1) {
-    do_check_neq(a1, null);
-    do_check_true(isExtensionInAddonsList(profileDir, a1.id));
-
-    do_execute_soon(do_test_finished);
-  });
-}