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

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

1 files changed, 0 insertions, 117 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js
deleted file mode 100644
index aa18a6946..000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug397778.js
+++ /dev/null
@@ -1,117 +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 PREF_MATCH_OS_LOCALE = "intl.locale.matchOS";
-const PREF_SELECTED_LOCALE = "general.useragent.locale";
-
-const ADDON = "test_bug397778";
-const ID = "bug397778@tests.mozilla.org";
-
-function run_test()
-{
-  // Setup for test
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
-  Services.prefs.setBoolPref(PREF_MATCH_OS_LOCALE, false);
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "fr-FR");
-
-  // Install test add-on
-  startupManager();
-  installAllFiles([do_get_addon(ADDON)], function() {
-    restartManager();
-
-    run_test_1();
-  });
-}
-
-function run_test_1() {
-  AddonManager.getAddonByID(ID, callback_soon(function(addon) {
-    do_check_neq(addon, null);
-    do_check_eq(addon.name, "fr Name");
-    do_check_eq(addon.description, "fr Description");
-
-    // Disable item
-    addon.userDisabled = true;
-    restartManager();
-
-    AddonManager.getAddonByID(ID, function(newAddon) {
-      do_check_neq(newAddon, null);
-      do_check_eq(newAddon.name, "fr Name");
-
-      do_execute_soon(run_test_2);
-    });
-  }));
-}
-
-function run_test_2() {
-  // Change locale. The more specific de-DE is the best match
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "de");
-  restartManager();
-
-  AddonManager.getAddonByID(ID, function(addon) {
-    do_check_neq(addon, null);
-    do_check_eq(addon.name, "de-DE Name");
-    do_check_eq(addon.description, null);
-
-    do_execute_soon(run_test_3);
-  });
-}
-
-function run_test_3() {
-  // Change locale. Locale case should have no effect
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "DE-de");
-  restartManager();
-
-  AddonManager.getAddonByID(ID, function(addon) {
-    do_check_neq(addon, null);
-    do_check_eq(addon.name, "de-DE Name");
-    do_check_eq(addon.description, null);
-
-    do_execute_soon(run_test_4);
-  });
-}
-
-function run_test_4() {
-  // Change locale. es-ES should closely match
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "es-AR");
-  restartManager();
-
-  AddonManager.getAddonByID(ID, function(addon) {
-    do_check_neq(addon, null);
-    do_check_eq(addon.name, "es-ES Name");
-    do_check_eq(addon.description, "es-ES Description");
-
-    do_execute_soon(run_test_5);
-  });
-}
-
-function run_test_5() {
-  // Change locale. Either zh-CN or zh-TW could match
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "zh");
-  restartManager();
-
-  AddonManager.getAddonByID(ID, function(addon) {
-    do_check_neq(addon, null);
-    if (addon.name != "zh-TW Name" && addon.name != "zh-CN Name")
-      do_throw("zh matched to " + addon.name);
-
-    do_execute_soon(run_test_6);
-  });
-}
-
-function run_test_6() {
-  // Unknown locale should try to match against en-US as well. Of en,en-GB
-  // en should match as being less specific
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "nl-NL");
-  restartManager();
-
-  AddonManager.getAddonByID(ID, function(addon) {
-    do_check_neq(addon, null);
-    do_check_eq(addon.name, "en Name");
-    do_check_eq(addon.description, "en Description");
-
-    do_execute_soon(do_test_finished);
-  });
-}