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

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

1 files changed, 0 insertions, 27 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js
deleted file mode 100644
index f11a942fb..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_bug425657.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-const ADDON = "test_bug425657";
-const ID = "bug425657@tests.mozilla.org";
-
-function run_test()
-{
-  // Setup for test
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
-
-  // Install test add-on
-  startupManager();
-  installAllFiles([do_get_addon(ADDON)], function() {
-    restartManager();
-    AddonManager.getAddonByID(ID, function(addon) {
-      do_check_neq(addon, null);
-      do_check_eq(addon.name, "Deutsches W\u00f6rterbuch");
-      do_check_eq(addon.name.length, 20);
-
-      do_execute_soon(do_test_finished);
-    });
-  });
-}