Backed out changeset 60d72c2dd49d (bug 1346616) for eslint failure in DirectoryLinksProvider.jsm. r=backout on a CLOSED TREE

addon-sdk/source/lib/sdk/l10n/locale.js

@@ -11,8 +11,58 @@ const prefs = require("../preferences/service");
 const { Cu, Cc, Ci } = require("chrome");
 const { Services } = Cu.import("resource://gre/modules/Services.jsm");
 
+/**
+ * Gets the currently selected locale for display.
+ * Gets all usable locale that we can use sorted by priority of relevance
+ * @return  Array of locales, begins with highest priority
+ */
+const PREF_MATCH_OS_LOCALE  = "intl.locale.matchOS";
+const PREF_SELECTED_LOCALE  = "general.useragent.locale";
+const PREF_ACCEPT_LANGUAGES = "intl.accept_languages";
+
 function getPreferedLocales(caseSensitve) {
-  return Services.locale.getRequestedLocales();
+  let locales = [];
+  function addLocale(locale) {
+    locale = locale.trim();
+    if (!caseSensitve)
+      locale = locale.toLowerCase();
+    if (locales.indexOf(locale) === -1)
+      locales.push(locale);
+  }
+
+  // Most important locale is OS one. But we use it, only if
+  // "intl.locale.matchOS" pref is set to `true`.
+  // Currently only used for multi-locales mobile builds.
+  // http://mxr.mozilla.org/mozilla-central/source/mobile/android/installer/Makefile.in#46
+  if (prefs.get(PREF_MATCH_OS_LOCALE, false)) {
+    let localeService = Cc["@mozilla.org/intl/nslocaleservice;1"].
+                        getService(Ci.nsILocaleService);
+    let osLocale = localeService.getLocaleComponentForUserAgent();
+    addLocale(osLocale);
+  }
+
+  // In some cases, mainly on Fennec and on Linux version,
+  // `general.useragent.locale` is a special 'localized' value, like:
+  // "chrome://global/locale/intl.properties"
+  let browserUiLocale = prefs.getLocalized(PREF_SELECTED_LOCALE, "") ||
+                        prefs.get(PREF_SELECTED_LOCALE, "");
+  if (browserUiLocale)
+    addLocale(browserUiLocale);
+
+  // Third priority is the list of locales used for web content
+  let contentLocales = prefs.getLocalized(PREF_ACCEPT_LANGUAGES, "") ||
+                       prefs.get(PREF_ACCEPT_LANGUAGES, "");
+  if (contentLocales) {
+    // This list is a string of locales seperated by commas.
+    // There is spaces after commas, so strip each item
+    for (let locale of contentLocales.split(","))
+      addLocale(locale.replace(/(^\s+)|(\s+$)/g, ""));
+  }
+
+  // Finally, we ensure that en-US is the final fallback if it wasn't added
+  addLocale("en-US");
+
+  return locales;
 }
 exports.getPreferedLocales = getPreferedLocales;
 

addon-sdk/source/test/test-l10n-locale.js

@@ -2,7 +2,128 @@
  * 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 { findClosestLocale } = require("sdk/l10n/locale");
+const { getPreferedLocales, findClosestLocale } = require("sdk/l10n/locale");
+const prefs = require("sdk/preferences/service");
+const { Cc, Ci, Cu } = require("chrome");
+const { Services } = Cu.import("resource://gre/modules/Services.jsm");
+const BundleService = Cc["@mozilla.org/intl/stringbundle;1"].getService(Ci.nsIStringBundleService);
+
+const PREF_MATCH_OS_LOCALE  = "intl.locale.matchOS";
+const PREF_SELECTED_LOCALE  = "general.useragent.locale";
+const PREF_ACCEPT_LANGUAGES = "intl.accept_languages";
+
+function assertPrefered(assert, expected, msg) {
+  assert.equal(JSON.stringify(getPreferedLocales()), JSON.stringify(expected),
+                   msg);
+}
+
+exports.testGetPreferedLocales = function(assert) {
+  prefs.set(PREF_MATCH_OS_LOCALE, false);
+  prefs.set(PREF_SELECTED_LOCALE, "");
+  prefs.set(PREF_ACCEPT_LANGUAGES, "");
+  assertPrefered(assert, ["en-us"],
+                 "When all preferences are empty, we only have en-us");
+
+  prefs.set(PREF_SELECTED_LOCALE, "fr");
+  prefs.set(PREF_ACCEPT_LANGUAGES, "jp");
+  assertPrefered(assert, ["fr", "jp", "en-us"],
+                 "We first have useragent locale, then web one and finally en-US");
+
+  prefs.set(PREF_SELECTED_LOCALE, "en-US");
+  prefs.set(PREF_ACCEPT_LANGUAGES, "en-US");
+  assertPrefered(assert, ["en-us"],
+                 "We do not have duplicates");
+
+  prefs.set(PREF_SELECTED_LOCALE, "en-US");
+  prefs.set(PREF_ACCEPT_LANGUAGES, "fr");
+  assertPrefered(assert, ["en-us", "fr"],
+                 "en-US can be first if specified by higher priority preference");
+
+  // Reset what we changed
+  prefs.reset(PREF_MATCH_OS_LOCALE);
+  prefs.reset(PREF_SELECTED_LOCALE);
+  prefs.reset(PREF_ACCEPT_LANGUAGES);
+}
+
+// In some cases, mainly on Fennec and on Linux version,
+// `general.useragent.locale` is a special 'localized' value, like:
+// "chrome://global/locale/intl.properties"
+exports.testPreferedLocalizedLocale = function(assert) {
+  prefs.set(PREF_MATCH_OS_LOCALE, false);
+  let bundleURL = "chrome://global/locale/intl.properties";
+  prefs.setLocalized(PREF_SELECTED_LOCALE, bundleURL);
+  let contentLocale = "ja";
+  prefs.set(PREF_ACCEPT_LANGUAGES, contentLocale);
+
+  // Read manually the expected locale value from the property file
+  let expectedLocale = BundleService.createBundle(bundleURL).
+    GetStringFromName(PREF_SELECTED_LOCALE).
+    toLowerCase();
+
+  // First add the useragent locale
+  let expectedLocaleList = [expectedLocale];
+
+  // Then the content locale
+  if (expectedLocaleList.indexOf(contentLocale) == -1)
+    expectedLocaleList.push(contentLocale);
+
+  // Add default "en-us" fallback if the main language is not already en-us
+  if (expectedLocaleList.indexOf("en-us") == -1)
+    expectedLocaleList.push("en-us");
+
+  assertPrefered(assert, expectedLocaleList, "test localized pref value");
+
+  // Reset what we have changed
+  prefs.reset(PREF_MATCH_OS_LOCALE);
+  prefs.reset(PREF_SELECTED_LOCALE);
+  prefs.reset(PREF_ACCEPT_LANGUAGES);
+}
+
+// On Linux the PREF_ACCEPT_LANGUAGES pref can be a localized pref.
+exports.testPreferedContentLocale = function(assert) {
+  prefs.set(PREF_MATCH_OS_LOCALE, false);
+  let noLocale = "",
+      bundleURL = "chrome://global/locale/intl.properties";
+  prefs.set(PREF_SELECTED_LOCALE, noLocale);
+  prefs.setLocalized(PREF_ACCEPT_LANGUAGES, bundleURL);
+
+  // Read the expected locale values from the property file
+  let expectedLocaleList = BundleService.createBundle(bundleURL).
+    GetStringFromName(PREF_ACCEPT_LANGUAGES).
+    split(",").
+    map(locale => locale.trim().toLowerCase());
+
+  // Add default "en-us" fallback if the main language is not already en-us
+  if (expectedLocaleList.indexOf("en-us") == -1)
+    expectedLocaleList.push("en-us");
+
+  assertPrefered(assert, expectedLocaleList, "test localized content locale pref value");
+
+  // Reset what we have changed
+  prefs.reset(PREF_MATCH_OS_LOCALE);
+  prefs.reset(PREF_SELECTED_LOCALE);
+  prefs.reset(PREF_ACCEPT_LANGUAGES);
+}
+
+exports.testPreferedOsLocale = function(assert) {
+  prefs.set(PREF_MATCH_OS_LOCALE, true);
+  prefs.set(PREF_SELECTED_LOCALE, "");
+  prefs.set(PREF_ACCEPT_LANGUAGES, "");
+
+  let expectedLocale = Services.locale.getAppLocaleAsLangTag().toLowerCase();
+  let expectedLocaleList = [expectedLocale];
+
+  // Add default "en-us" fallback if the main language is not already en-us
+  if (expectedLocale != "en-us")
+    expectedLocaleList.push("en-us");
+
+  assertPrefered(assert, expectedLocaleList, "Ensure that we select OS locale when related preference is set");
+
+  // Reset what we have changed
+  prefs.reset(PREF_MATCH_OS_LOCALE);
+  prefs.reset(PREF_SELECTED_LOCALE);
+  prefs.reset(PREF_ACCEPT_LANGUAGES);
+}
 
 exports.testFindClosestLocale = function(assert) {
   // Second param of findClosestLocale (aMatchLocales) have to be in lowercase

browser/components/dirprovider/DirectoryProvider.cpp

@@ -19,14 +19,11 @@
 #include "nsCOMArray.h"
 #include "nsDirectoryServiceUtils.h"
 #include "mozilla/ModuleUtils.h"
-#include "mozilla/intl/LocaleService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsXULAppAPI.h"
 #include "nsIPrefLocalizedString.h"
 
-using mozilla::intl::LocaleService;
-
 namespace mozilla {
 namespace browser {
 
@@ -128,18 +125,31 @@ AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array)
     }
 
     // we didn't have a defaultLocale, use the user agent locale
-    nsAutoCString locale;
-    LocaleService::GetInstance()->GetAppLocaleAsLangTag(locale);
+    nsCString locale;
+    nsCOMPtr<nsIPrefLocalizedString> prefString;
+    rv = prefs->GetComplexValue("general.useragent.locale",
+                                NS_GET_IID(nsIPrefLocalizedString),
+                                getter_AddRefs(prefString));
+    if (NS_SUCCEEDED(rv)) {
+      nsAutoString wLocale;
+      prefString->GetData(getter_Copies(wLocale));
+      CopyUTF16toUTF8(wLocale, locale);
+    } else {
+      rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale));
+    }
 
-    nsCOMPtr<nsIFile> curLocalePlugins;
-    rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins));
     if (NS_SUCCEEDED(rv)) {
 
-      curLocalePlugins->AppendNative(locale);
-      rv = curLocalePlugins->Exists(&exists);
-      if (NS_SUCCEEDED(rv) && exists) {
-        array.AppendObject(curLocalePlugins);
-        return; // all done
+      nsCOMPtr<nsIFile> curLocalePlugins;
+      rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins));
+      if (NS_SUCCEEDED(rv)) {
+
+        curLocalePlugins->AppendNative(locale);
+        rv = curLocalePlugins->Exists(&exists);
+        if (NS_SUCCEEDED(rv) && exists) {
+          array.AppendObject(curLocalePlugins);
+          return; // all done
+        }
       }
     }
   }

browser/components/distribution.js

@@ -57,7 +57,7 @@ DistributionCustomizer.prototype = {
   },
 
   get _locale() {
-    const locale = Services.locale.getRequestedLocale() || "en-US";
+    let locale = this._prefs.getCharPref("general.useragent.locale", "en-US");
     this.__defineGetter__("_locale", () => locale);
     return this._locale;
   },

browser/components/extensions/test/browser/head_pageAction.js

@@ -133,8 +133,7 @@ function* runTests(options) {
     });
   });
 
-  let reqLoc = Services.locale.getRequestedLocales();
-  Services.locale.setRequestedLocales(["es-ES"]);
+  yield SpecialPowers.pushPrefEnv({set: [["general.useragent.locale", "es-ES"]]});
 
   yield extension.startup();
 
@@ -142,7 +141,7 @@ function* runTests(options) {
 
   yield extension.unload();
 
-  Services.locale.setRequestedLocales(reqLoc);
+  yield SpecialPowers.popPrefEnv();
 
   let node = document.getElementById(pageActionId);
   is(node, null, "pageAction image removed from document");

browser/components/search/test/head.js

@@ -21,7 +21,22 @@ function isSubObjectOf(expectedObj, actualObj, name) {
 }
 
 function getLocale() {
-  return Services.locale.getRequestedLocale() || undefined;
+  const localePref = "general.useragent.locale";
+  return getLocalizedPref(localePref, Services.prefs.getCharPref(localePref));
+}
+
+/**
+ * Wrapper for nsIPrefBranch::getComplexValue.
+ * @param aPrefName
+ *        The name of the pref to get.
+ * @returns aDefault if the requested pref doesn't exist.
+ */
+function getLocalizedPref(aPrefName, aDefault) {
+  try {
+    return Services.prefs.getComplexValue(aPrefName, Ci.nsIPrefLocalizedString).data;
+  } catch (ex) {
+    return aDefault;
+  }
 }
 
 function promiseEvent(aTarget, aEventName, aPreventDefault) {

browser/extensions/pdfjs/content/PdfStreamConverter.jsm

@@ -314,7 +314,7 @@ class ChromeActions {
   }
 
   getLocale() {
-    return Services.locale.getRequestedLocale() || "en-US";
+    return getStringPref("general.useragent.locale", "en-US");
   }
 
   getStrings(data) {

browser/modules/DirectoryLinksProvider.jsm

@@ -49,6 +49,12 @@ XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function() {
 const DIRECTORY_LINKS_FILE = "directoryLinks.json";
 const DIRECTORY_LINKS_TYPE = "application/json";
 
+// The preference that tells whether to match the OS locale
+const PREF_MATCH_OS_LOCALE = "intl.locale.matchOS";
+
+// The preference that tells what locale the user selected
+const PREF_SELECTED_LOCALE = "general.useragent.locale";
+
 // The preference that tells where to obtain directory links
 const PREF_DIRECTORY_SOURCE = "browser.newtabpage.directory.source";
 
@@ -160,6 +166,8 @@ var DirectoryLinksProvider = {
     return Object.freeze({
       enhanced: PREF_NEWTAB_ENHANCED,
       linksURL: PREF_DIRECTORY_SOURCE,
+      matchOSLocale: PREF_MATCH_OS_LOCALE,
+      prefSelectedLocale: PREF_SELECTED_LOCALE,
     });
   },
 
@@ -180,7 +188,26 @@ var DirectoryLinksProvider = {
    * @return  the selected locale or "en-US" if none is selected
    */
   get locale() {
-    return Services.locale.getRequestedLocale() || "en-US";
+    let matchOS = Services.prefs.getBoolPref(PREF_MATCH_OS_LOCALE, false);
+
+    if (matchOS) {
+      return Cc["@mozilla.org/intl/ospreferences;1"].
+             getService(Ci.mozIOSPreferences).systemLocale;
+    }
+
+    try {
+      let locale = Services.prefs.getComplexValue(PREF_SELECTED_LOCALE,
+                                                  Ci.nsIPrefLocalizedString);
+      if (locale) {
+        return locale.data;
+      }
+    } catch (e) {}
+
+    try {
+      return Services.prefs.getCharPref(PREF_SELECTED_LOCALE);
+    } catch (e) {}
+
+    return "en-US";
   },
 
   /**
@@ -209,11 +236,14 @@ var DirectoryLinksProvider = {
 
         case this._observedPrefs.linksURL:
           delete this.__linksURL;
+          // fallthrough
+
+        // Force directory download on changes to fetch related prefs
+        case this._observedPrefs.matchOSLocale:
+        case this._observedPrefs.prefSelectedLocale:
           this._fetchAndCacheLinksIfNecessary(true);
           break;
       }
-    } else if (aTopic === "intl:requested-locales-changed") {
-      this._fetchAndCacheLinksIfNecessary(true);
     }
   },
 
@@ -660,7 +690,6 @@ var DirectoryLinksProvider = {
   init: function DirectoryLinksProvider_init() {
     this._setDefaultEnhanced();
     this._addPrefsObserver();
-    Services.obs.addObserver(this, "intl:requested-locales-changed", false);
     // setup directory file path and last download timestamp
     this._directoryFilePath = OS.Path.join(OS.Constants.Path.localProfileDir, DIRECTORY_LINKS_FILE);
     this._lastDownloadMS = 0;
@@ -1184,7 +1213,6 @@ var DirectoryLinksProvider = {
     delete this.__linksURL;
     this._removePrefsObserver();
     this._removeObservers();
-    Services.obs.removeObserver(this, "intl:requested-locales-changed");
   },
 
   addObserver: function DirectoryLinksProvider_addObserver(aObserver) {

browser/modules/test/unit/test_DirectoryLinksProvider.js

@@ -34,6 +34,7 @@ const kURLData = {"directory": [{"url": "http://example.com", "title": "LocalSou
 const kTestURL = "data:application/json," + JSON.stringify(kURLData);
 
 // DirectoryLinksProvider preferences
+const kLocalePref = DirectoryLinksProvider._observedPrefs.prefSelectedLocale;
 const kSourceUrlPref = DirectoryLinksProvider._observedPrefs.linksURL;
 const kPingUrlPref = "browser.newtabpage.directory.ping";
 const kNewtabEnhancedPref = "browser.newtabpage.enhanced";
@@ -50,8 +51,7 @@ const kFailURL = kBaseUrl + kFailPath;
 const kPingUrl = kBaseUrl + kPingPath;
 
 // app/profile/firefox.js are not avaialble in xpcshell: hence, preset them
-const origReqLocales = Services.locale.getRequestedLocales();
-Services.locale.setRequestedLocales(["en-US"]);
+Services.prefs.setCharPref(kLocalePref, "en-US");
 Services.prefs.setCharPref(kSourceUrlPref, kTestURL);
 Services.prefs.setCharPref(kPingUrlPref, kPingUrl);
 Services.prefs.setBoolPref(kNewtabEnhancedPref, true);
@@ -201,7 +201,7 @@ function promiseSetupDirectoryLinksProvider(options = {}) {
   return Task.spawn(function*() {
     let linksURL = options.linksURL || kTestURL;
     yield DirectoryLinksProvider.init();
-    Services.locale.setRequestedLocales([options.locale || "en-US"]);
+    yield promiseDirectoryDownloadOnPrefChange(kLocalePref, options.locale || "en-US");
     yield promiseDirectoryDownloadOnPrefChange(kSourceUrlPref, linksURL);
     do_check_eq(DirectoryLinksProvider._linksURL, linksURL);
     DirectoryLinksProvider._lastDownloadMS = options.lastDownloadMS || 0;
@@ -210,7 +210,7 @@ function promiseSetupDirectoryLinksProvider(options = {}) {
 
 function promiseCleanDirectoryLinksProvider() {
   return Task.spawn(function*() {
-    Services.locale.setRequestedLocales(["en-US"]);
+    yield promiseDirectoryDownloadOnPrefChange(kLocalePref, "en-US");
     yield promiseDirectoryDownloadOnPrefChange(kSourceUrlPref, kTestURL);
     yield DirectoryLinksProvider._clearFrequencyCap();
     yield DirectoryLinksProvider._loadInadjacentSites();
@@ -233,7 +233,7 @@ function run_test() {
   do_register_cleanup(function() {
     server.stop(function() { });
     DirectoryLinksProvider.reset();
-    Services.locale.setRequestedLocales(origReqLocales);
+    Services.prefs.clearUserPref(kLocalePref);
     Services.prefs.clearUserPref(kSourceUrlPref);
     Services.prefs.clearUserPref(kPingUrlPref);
     Services.prefs.clearUserPref(kNewtabEnhancedPref);

dom/encoding/FallbackEncoding.cpp

@@ -10,7 +10,6 @@
 #include "nsUConvPropertySearch.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
-#include "nsIObserverService.h"
 #include "mozilla/intl/LocaleService.h"
 
 using mozilla::intl::LocaleService;
@@ -30,17 +29,21 @@ static constexpr nsUConvProp nonParticipatingDomains[] = {
 #include "nonparticipatingdomains.properties.h"
 };
 
-NS_IMPL_ISUPPORTS(FallbackEncoding, nsIObserver)
-
 FallbackEncoding* FallbackEncoding::sInstance = nullptr;
 bool FallbackEncoding::sGuessFallbackFromTopLevelDomain = true;
 
 FallbackEncoding::FallbackEncoding()
 {
+  MOZ_COUNT_CTOR(FallbackEncoding);
   MOZ_ASSERT(!FallbackEncoding::sInstance,
              "Singleton already exists.");
 }
 
+FallbackEncoding::~FallbackEncoding()
+{
+  MOZ_COUNT_DTOR(FallbackEncoding);
+}
+
 void
 FallbackEncoding::Get(nsACString& aFallback)
 {
@@ -115,16 +118,6 @@ FallbackEncoding::PrefChanged(const char*, void*)
   FallbackEncoding::sInstance->Invalidate();
 }
 
-NS_IMETHODIMP
-FallbackEncoding::Observe(nsISupports *aSubject, const char *aTopic,
-                         const char16_t *aData)
-{
-  MOZ_ASSERT(FallbackEncoding::sInstance,
-             "Observe callback called with null fallback cache.");
-  FallbackEncoding::sInstance->Invalidate();
-  return NS_OK;
-}
-
 void
 FallbackEncoding::Initialize()
 {
@@ -134,13 +127,11 @@ FallbackEncoding::Initialize()
   Preferences::RegisterCallback(FallbackEncoding::PrefChanged,
                                 "intl.charset.fallback.override",
                                 nullptr);
+  Preferences::RegisterCallback(FallbackEncoding::PrefChanged,
+                                "general.useragent.locale",
+                                nullptr);
   Preferences::AddBoolVarCache(&sGuessFallbackFromTopLevelDomain,
                                "intl.charset.fallback.tld");
-
-  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-  if (obs) {
-    obs->AddObserver(sInstance, "intl:requested-locales-changed", true);
-  }
 }
 
 void
@@ -148,10 +139,6 @@ FallbackEncoding::Shutdown()
 {
   MOZ_ASSERT(FallbackEncoding::sInstance,
              "Releasing non-existent fallback cache.");
-  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-  if (obs) {
-    obs->RemoveObserver(sInstance, "intl:requested-locales-changed");
-  }
   delete FallbackEncoding::sInstance;
   FallbackEncoding::sInstance = nullptr;
 }

dom/encoding/FallbackEncoding.h

@@ -7,17 +7,14 @@
 #ifndef mozilla_dom_FallbackEncoding_h_
 #define mozilla_dom_FallbackEncoding_h_
 
-#include "nsIObserver.h"
 #include "nsString.h"
 
 namespace mozilla {
 namespace dom {
 
-class FallbackEncoding : public nsIObserver
+class FallbackEncoding
 {
 public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIOBSERVER
 
   /**
    * Whether FromTopLevelDomain() should be used.
@@ -71,7 +68,7 @@ private:
   static FallbackEncoding* sInstance;
 
   FallbackEncoding();
-  virtual ~FallbackEncoding() {};
+  ~FallbackEncoding();
 
   /**
    * Invalidates the cache.

intl/locale/LocaleService.cpp

@@ -747,24 +747,6 @@ LocaleService::GetRequestedLocales(uint32_t* aCount, char*** aOutArray)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-LocaleService::GetRequestedLocale(nsACString& aRetVal)
-{
-  AutoTArray<nsCString, 16> requestedLocales;
-  bool res = GetRequestedLocales(requestedLocales);
-
-  if (!res) {
-    NS_ERROR("Couldn't retrieve selected locales from prefs!");
-    return NS_ERROR_FAILURE;
-  }
-
-  if (requestedLocales.Length() > 0) {
-    aRetVal = requestedLocales[0];
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 LocaleService::SetRequestedLocales(const char** aRequested,
                                    uint32_t aRequestedCount)

intl/locale/mozILocaleService.idl

@@ -143,11 +143,6 @@ interface mozILocaleService : nsISupports
   void getRequestedLocales([optional] out unsigned long aCount,
                            [retval, array, size_is(aCount)] out string aLocales);
 
-  /**
-   * Returns the top-requested locale from the user, or an empty string if none is set.
-   */
-  ACString getRequestedLocale();
-
   /**
    * Sets a list of locales that the user requested the app to be
    * localized to.

intl/locale/tests/unit/test_localeService.js

@@ -117,24 +117,6 @@ add_test(function test_getRequestedLocales_matchOS() {
   run_next_test();
 });
 
-add_test(function test_getRequestedLocale() {
-  Services.prefs.setBoolPref(PREF_MATCH_OS_LOCALE, false);
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "tlh");
-
-  let requestedLocale = localeService.getRequestedLocale();
-  do_check_true(requestedLocale === "tlh", "requestedLocale returns the right value");
-
-  Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "");
-
-  requestedLocale = localeService.getRequestedLocale();
-  do_check_true(requestedLocale === "", "requestedLocale returns empty value value");
-
-  Services.prefs.clearUserPref(PREF_MATCH_OS_LOCALE);
-  Services.prefs.clearUserPref(PREF_SELECTED_LOCALE);
-
-  run_next_test();
-});
-
 add_test(function test_setRequestedLocales() {
   localeService.setRequestedLocales([]);
 

mobile/android/chrome/content/browser.js

@@ -1647,7 +1647,15 @@ var BrowserApp = {
   },
 
   getUALocalePref: function () {
-    return Services.locale.getRequestedLocale() || undefined;
+    try {
+      return Services.prefs.getComplexValue("general.useragent.locale", Ci.nsIPrefLocalizedString).data;
+    } catch (e) {
+      try {
+        return Services.prefs.getCharPref("general.useragent.locale");
+      } catch (ee) {
+        return undefined;
+      }
+    }
   },
 
   getOSLocalePref: function () {

mobile/android/components/DirectoryProvider.js

@@ -113,9 +113,14 @@ DirectoryProvider.prototype = {
       return;
 
     let curLocale = "";
-    let reqLocales = Services.locales.getRequestedLocales();
-    if (reqLocales.length > 0) {
-      curLocale = reqLocales[0];
+    try {
+      curLocale = Services.prefs.getComplexValue("general.useragent.locale", Ci.nsIPrefLocalizedString).data;
+    } catch (e) {
+      // eslint-disable-next-line mozilla/use-default-preference-values
+      try {
+        curLocale = Services.prefs.getCharPref("general.useragent.locale");
+      } catch (ee) {
+      }
     }
 
     if (curLocale) {

toolkit/components/downloads/ApplicationReputation.cpp

@@ -36,7 +36,6 @@
 #include "mozilla/SizePrintfMacros.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/intl/LocaleService.h"
 
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
@@ -63,7 +62,6 @@ using mozilla::OriginAttributes;
 using mozilla::Preferences;
 using mozilla::TimeStamp;
 using mozilla::Telemetry::Accumulate;
-using mozilla::intl::LocaleService;
 using safe_browsing::ClientDownloadRequest;
 using safe_browsing::ClientDownloadRequest_CertificateChain;
 using safe_browsing::ClientDownloadRequest_Resource;
@@ -75,6 +73,7 @@ using safe_browsing::ClientDownloadRequest_SignatureInfo;
 #define PREF_SB_DOWNLOADS_ENABLED "browser.safebrowsing.downloads.enabled"
 #define PREF_SB_DOWNLOADS_REMOTE_ENABLED "browser.safebrowsing.downloads.remote.enabled"
 #define PREF_SB_DOWNLOADS_REMOTE_TIMEOUT "browser.safebrowsing.downloads.remote.timeout_ms"
+#define PREF_GENERAL_LOCALE "general.useragent.locale"
 #define PREF_DOWNLOAD_BLOCK_TABLE "urlclassifier.downloadBlockTable"
 #define PREF_DOWNLOAD_ALLOW_TABLE "urlclassifier.downloadAllowTable"
 
@@ -1320,8 +1319,8 @@ PendingLookup::SendRemoteQueryInternal()
   mRequest.set_user_initiated(true);
 
   nsCString locale;
-  rv = LocaleService::GetInstance()->GetAppLocaleAsLangTag(locale);
-  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_SUCCESS(Preferences::GetCString(PREF_GENERAL_LOCALE, &locale),
+                    NS_ERROR_NOT_AVAILABLE);
   mRequest.set_locale(locale.get());
   nsCString sha256Hash;
   rv = mQuery->GetSha256Hash(sha256Hash);

toolkit/components/search/nsSearchService.js

@@ -875,7 +875,12 @@ function getDir(aKey, aIFace) {
  * exists in nsHttpHandler.cpp when building the UA string.
  */
 function getLocale() {
-  return Services.locale.getRequestedLocale();
+  let locale = getLocalizedPref(LOCALE_PREF);
+  if (locale)
+    return locale;
+
+  // Not localized.
+  return Services.prefs.getCharPref(LOCALE_PREF);
 }
 
 /**

toolkit/modules/Locale.jsm

@@ -9,13 +9,26 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 
+const PREF_MATCH_OS_LOCALE            = "intl.locale.matchOS";
+const PREF_SELECTED_LOCALE            = "general.useragent.locale";
+
 this.Locale = {
   /**
    * Gets the currently selected locale for display.
    * @return  the selected locale or "en-US" if none is selected
    */
   getLocale() {
-    return Services.locale.getRequestedLocale() || "en-US";
+    if (Preferences.get(PREF_MATCH_OS_LOCALE, false)) {
+      const osPrefs =
+        Cc["@mozilla.org/intl/ospreferences;1"].getService(Ci.mozIOSPreferences);
+      return osPrefs.systemLocale;
+    }
+    try {
+      let locale = Preferences.get(PREF_SELECTED_LOCALE, null, Ci.nsIPrefLocalizedString);
+      if (locale)
+        return locale;
+    } catch (e) {}
+    return Preferences.get(PREF_SELECTED_LOCALE, "en-US");
   },
 
   /**

toolkit/mozapps/extensions/AddonManager.jsm

@@ -41,6 +41,8 @@ const PREF_EM_HOTFIX_LASTVERSION      = "extensions.hotfix.lastVersion";
 const PREF_EM_HOTFIX_URL              = "extensions.hotfix.url";
 const PREF_EM_CERT_CHECKATTRIBUTES    = "extensions.hotfix.cert.checkAttributes";
 const PREF_EM_HOTFIX_CERTS            = "extensions.hotfix.certs.";
+const PREF_MATCH_OS_LOCALE            = "intl.locale.matchOS";
+const PREF_SELECTED_LOCALE            = "general.useragent.locale";
 const UNKNOWN_XPCOM_ABI               = "unknownABI";
 
 const PREF_MIN_WEBEXT_PLATFORM_VERSION = "extensions.webExtensionsMinPlatformVersion";
@@ -324,7 +326,26 @@ function promiseCallProvider(aProvider, aMethod, ...aArgs) {
  * @return  the selected locale or "en-US" if none is selected
  */
 function getLocale() {
-  return Services.locale.getRequestedLocale() || "en-US";
+  try {
+    if (Services.prefs.getBoolPref(PREF_MATCH_OS_LOCALE)) {
+      const osPrefs =
+        Cc["@mozilla.org/intl/ospreferences;1"].getService(Ci.mozIOSPreferences);
+      return osPrefs.systemLocale;
+    }
+  } catch (e) { }
+
+  try {
+    let locale = Services.prefs.getComplexValue(PREF_SELECTED_LOCALE,
+                                                Ci.nsIPrefLocalizedString);
+    if (locale)
+      return locale;
+  } catch (e) { }
+
+  try {
+    return Services.prefs.getCharPref(PREF_SELECTED_LOCALE);
+  } catch (e) { }
+
+  return "en-US";
 }
 
 function webAPIForAddon(addon) {

toolkit/mozapps/extensions/nsBlocklistService.js

@@ -48,6 +48,7 @@ const PREF_BLOCKLIST_PINGCOUNTVERSION = "extensions.blocklist.pingCountVersion";
 const PREF_BLOCKLIST_SUPPRESSUI       = "extensions.blocklist.suppressUI";
 const PREF_ONECRL_VIA_AMO             = "security.onecrl.via.amo";
 const PREF_BLOCKLIST_UPDATE_ENABLED   = "services.blocklist.update_enabled";
+const PREF_GENERAL_USERAGENT_LOCALE   = "general.useragent.locale";
 const PREF_APP_DISTRIBUTION           = "distribution.id";
 const PREF_APP_DISTRIBUTION_VERSION   = "distribution.version";
 const PREF_EM_LOGGING_ENABLED         = "extensions.logging.enabled";
@@ -241,7 +242,14 @@ function matchesOSABI(blocklistElement) {
  * exists in nsHttpHandler.cpp when building the UA string.
  */
 function getLocale() {
-  return Services.locale.getRequestedLocales();
+  try {
+      // Get the default branch
+      var defaultPrefs = gPref.getDefaultBranch(null);
+      return defaultPrefs.getComplexValue(PREF_GENERAL_USERAGENT_LOCALE,
+                                          Ci.nsIPrefLocalizedString).data;
+  } catch (e) {}
+
+  return gPref.getCharPref(PREF_GENERAL_USERAGENT_LOCALE);
 }
 
 /* Get the distribution pref values, from defaults only */

toolkit/xre/nsAppRunner.cpp

@@ -19,7 +19,6 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/intl/LocaleService.h"
 
 #include "nsAppRunner.h"
 #include "mozilla/XREAppData.h"
@@ -289,7 +288,6 @@ using mozilla::Unused;
 using mozilla::scache::StartupCache;
 using mozilla::dom::ContentParent;
 using mozilla::dom::ContentChild;
-using mozilla::intl::LocaleService;
 
 // Save literal putenv string to environment variable.
 static void
@@ -4373,8 +4371,13 @@ XREMain::XRE_mainRun()
 
 #ifdef MOZ_CRASHREPORTER
   nsCString userAgentLocale;
-  LocaleService::GetInstance()->GetAppLocaleAsLangTag(userAgentLocale);
-  CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("useragent_locale"), userAgentLocale);
+  // Try a localized string first. This pref is always a localized string in
+  // Fennec, and might be elsewhere, too.
+  if (NS_SUCCEEDED(Preferences::GetLocalizedCString("general.useragent.locale", &userAgentLocale))) {
+    CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("useragent_locale"), userAgentLocale);
+  } else if (NS_SUCCEEDED(Preferences::GetCString("general.useragent.locale", &userAgentLocale))) {
+    CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("useragent_locale"), userAgentLocale);
+  }
 #endif
 
   appStartup->GetShuttingDown(&mShuttingDown);