Revert of ChromeOS: should not show "Language changed" notification for certain languages.

ui/base/l10n/l10n_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
@@ skipping 293 matching lines @@
     g_available_locales = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace l10n_util {
 
 std::string GetCanonicalLocale(const std::string& locale) {
   return base::i18n::GetCanonicalLocale(locale.c_str());
 }
 
-std::string GetLanguage(const std::string& locale) {
-  const std::string::size_type hyphen_pos = locale.find('-');
-  return std::string(locale, 0, hyphen_pos);
-}
-
 bool CheckAndResolveLocale(const std::string& locale,
                            std::string* resolved_locale) {
 #if defined(OS_MACOSX)
   NOTIMPLEMENTED();
   return false;
 #else
   if (IsLocaleAvailable(locale)) {
     *resolved_locale = locale;
     return true;
   }
 
   // If there's a variant, skip over it so we can try without the region
   // code.  For example, ca_ES@valencia should cause us to try ca@valencia
   // before ca.
   std::string::size_type variant_pos = locale.find('@');
   if (variant_pos != std::string::npos)
     return false;
 
   // If the locale matches language but not country, use that instead.
   // TODO(jungshik) : Nothing is done about languages that Chrome
   // does not support but available on Windows. We fall
   // back to en-US in GetApplicationLocale so that it's a not critical,
   // but we can do better.
-  const std::string lang(GetLanguage(locale));
-  if (lang.size() < locale.size()) {
-    std::string region(locale, lang.size() + 1);
+  std::string::size_type hyphen_pos = locale.find('-');
+  std::string lang(locale, 0, hyphen_pos);
+  if (hyphen_pos != std::string::npos && hyphen_pos > 0) {
+    std::string region(locale, hyphen_pos + 1);
     std::string tmp_locale(lang);
     // Map es-RR other than es-ES to es-419 (Chrome's Latin American
     // Spanish locale).
     if (LowerCaseEqualsASCII(lang, "es") &&
         !LowerCaseEqualsASCII(region, "es")) {
       tmp_locale.append("-419");
     } else if (LowerCaseEqualsASCII(lang, "zh")) {
       // Map zh-HK and zh-MO to zh-TW. Otherwise, zh-FOO is mapped to zh-CN.
       if (LowerCaseEqualsASCII(region, "hk") ||
           LowerCaseEqualsASCII(region, "mo")) { // Macao
@@ skipping 519 matching lines @@
   }
 }
 
 int GetLocalizedContentsWidthInPixels(int pixel_resource_id) {
   int width = 0;
   base::StringToInt(l10n_util::GetStringUTF8(pixel_resource_id), &width);
   DCHECK_GT(width, 0);
   return width;
 }
 
-const char* const* GetAcceptLanguageListForTesting() {
-  return kAcceptLanguageList;
-}
-
-size_t GetAcceptLanguageListSizeForTesting() {
-  return arraysize(kAcceptLanguageList);
-}
-
 }  // namespace l10n_util