Merge backout of bug 542999
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 29 Nov 2010 20:50:32 -0500
changeset 58356 0bb90b42a363d2383fd8603e35b44b6cea8bd63e
parent 58354 1cb9c0d5b701ded96fb50ba85eb5cb35597fabf4 (current diff)
parent 58355 d919a5aabf9e1d638824d4f1e20d476b8ecad8e7 (diff)
child 58357 9231797ba1062b8fc8138389e4439307541a7dd5
push idunknown
push userunknown
push dateunknown
bugs542999
milestone2.0b8pre
Merge backout of bug 542999
chrome/src/nsChromeRegistry.cpp
chrome/src/nsChromeRegistryChrome.cpp
chrome/test/unit/test_bug519468.js
--- a/chrome/src/nsChromeRegistryChrome.cpp
+++ b/chrome/src/nsChromeRegistryChrome.cpp
@@ -327,21 +327,20 @@ nsChromeRegistryChrome::GetSelectedLocal
 
   return NS_OK;
 }
 
 nsresult
 nsChromeRegistryChrome::SelectLocaleFromPref(nsIPrefBranch* prefs)
 {
   nsresult rv;
-  PRBool matchOSLocale = PR_FALSE, userLocaleOverride = PR_FALSE;
-  prefs->PrefHasUserValue(SELECTED_LOCALE_PREF, &userLocaleOverride);
+  PRBool matchOSLocale = PR_FALSE;
   rv = prefs->GetBoolPref(MATCH_OS_LOCALE_PREF, &matchOSLocale);
 
-  if (NS_SUCCEEDED(rv) && matchOSLocale && !userLocaleOverride) {
+  if (NS_SUCCEEDED(rv) && matchOSLocale) {
     // compute lang and region code only when needed!
     nsCAutoString uiLocale;
     rv = getUILangCountry(uiLocale);
     if (NS_SUCCEEDED(rv))
       mSelectedLocale = uiLocale;
   }
   else {
     nsXPIDLCString provider;
new file mode 100644
--- /dev/null
+++ b/chrome/test/unit/data/test_bug519468.manifest
@@ -0,0 +1,2 @@
+locale testmatchos en-US jar:en-US.jar!/locale/en-US/global/
+locale testmatchos fr-FR jar:en-US.jar!/locale/en-US/global/
--- a/chrome/test/unit/test_bug519468.js
+++ b/chrome/test/unit/test_bug519468.js
@@ -31,91 +31,48 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK *****
  */
 
-function write_locale(stream, locale, package) {
-  var s = "locale " + package + " " + locale + " jar:" + locale + ".jar!";
-  s += "/locale/" + locale + "/" + package +"/\n";
-  stream.write(s, s.length);
-}
-
-var localeService = Cc["@mozilla.org/intl/nslocaleservice;1"]
-                    .getService(Ci.nsILocaleService);
-
-var systemLocale = localeService.getLocaleComponentForUserAgent();
-
-var locales;
-
-if (systemLocale == "en-US")
-  locales = [ "en-US", "fr-FR", "de-DE" ];
-else if (systemLocale == "fr-FR")
-  locales = [ "en-US", systemLocale, "de-DE" ];
-else
-  locales = [ "en-US", systemLocale, "fr-FR" ];
-
-do_get_profile();
-var workingDir = Cc["@mozilla.org/file/directory_service;1"].
-                 getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile);
-var manifest = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
-manifest.initWithFile(workingDir);
-manifest.append("test_bug519468.manifest");
-manifest.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
-var stream = Cc["@mozilla.org/network/file-output-stream;1"].
-             createInstance(Ci.nsIFileOutputStream);
-stream.init(manifest, 0x04 | 0x08 | 0x20, 0600, 0); // write, create, truncate
-locales.slice(0,2).forEach(function(l) write_locale(stream, l, "testmatchos"));
-write_locale(stream, locales[2], "testnomatchos");
-stream.close();
-
 var MANIFESTS = [
-  manifest
+  do_get_file("data/test_bug519468.manifest")
 ];
 
 registerManifests(MANIFESTS);
 
 var chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"]
                 .getService(Ci.nsIXULChromeRegistry)
                 .QueryInterface(Ci.nsIToolkitChromeRegistry);
 chromeReg.checkForNewChrome();
 
 var prefService = Cc["@mozilla.org/preferences-service;1"]
                   .getService(Ci.nsIPrefService)
                   .QueryInterface(Ci.nsIPrefBranch);
 
 function test_locale(aTest) {
   prefService.setBoolPref("intl.locale.matchOS", aTest.matchOS);
-  if (aTest.selected)
-    prefService.setCharPref("general.useragent.locale", aTest.selected);
-  else
-    try {
-      prefService.clearUserPref("general.useragent.locale");
-    } catch(e) {}
+  prefService.setCharPref("general.useragent.locale", aTest.selected || "en-US");
 
-  var selectedLocale = chromeReg.getSelectedLocale(aTest.package);
+  var selectedLocale = chromeReg.getSelectedLocale("testmatchos");
   do_check_eq(selectedLocale, aTest.locale);
 }
 
 function run_test()
 {
+  var systemLocale = localeService.getLocaleComponentForUserAgent();
+
   var tests = [
+    {matchOS: false, selected: null, locale: "en-US"},
     {matchOS: true, selected: null, locale: systemLocale},
-    {matchOS: true, selected: locales[0], locale: locales[0]},
-    {matchOS: true, selected: locales[1], locale: locales[1]},
-    {matchOS: true, selected: locales[2], locale: locales[0]},
-    {matchOS: true, selected: null, locale: locales[2], package: "testnomatchos"},
-    {matchOS: false, selected: null, locale: locales[0]},
-    {matchOS: false, selected: locales[0], locale: locales[0]},
-    {matchOS: false, selected: locales[1], locale: locales[1]},
-    {matchOS: false, selected: locales[2], locale: locales[0]},
+    {matchOS: true, selected: "fr-FR", locale: systemLocale},
+    {matchOS: false, selected: "fr-FR", locale: "fr-FR"},
+    {matchOS: true, selected: null, locale: systemLocale}
   ];
 
   for (var i = 0; i < tests.length; ++ i) {
     var test = tests[i];
-    if (!test.package)
-      test.package = "testmatchos";
     test_locale(test);
   }
 }