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

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

1 files changed, 0 insertions, 58 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_general.js b/toolkit/mozapps/webextensions/test/xpcshell/test_general.js
deleted file mode 100644
index e69b13314..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_general.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This just verifies that the EM can actually startup and shutdown a few times
-// without any errors
-
-// We have to look up how many add-ons are present since there will be plugins
-// etc. detected
-var gCount;
-
-function run_test() {
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-  var count = 0;
-  startupManager();
-  AddonManager.getAddonsByTypes(null, function(list) {
-    gCount = list.length;
-
-    do_execute_soon(run_test_1);
-  });
-}
-
-function run_test_1() {
-  restartManager();
-
-  AddonManager.getAddonsByTypes(null, function(addons) {
-    do_check_eq(gCount, addons.length);
-
-    AddonManager.getAddonsWithOperationsByTypes(null, function(pendingAddons) {
-      do_check_eq(0, pendingAddons.length);
-
-      do_execute_soon(run_test_2);
-    });
-  });
-}
-
-function run_test_2() {
-  shutdownManager();
-
-  startupManager(false);
-
-  AddonManager.getAddonsByTypes(null, function(addons) {
-    do_check_eq(gCount, addons.length);
-
-    do_execute_soon(run_test_3);
-  });
-}
-
-function run_test_3() {
-  restartManager();
-
-  AddonManager.getAddonsByTypes(null, callback_soon(function(addons) {
-    do_check_eq(gCount, addons.length);
-    do_test_finished();
-  }));
-}