Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/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 182 matching lines @@
     "zh_hans_cn",
     "zh_hant_hk",
     "zh_hant_mo",
     "zh_hans_sg",
     "zh_hant_tw"
   };
 
   // Skip all 'es_RR'. Currently, we use 'es' for es-ES (Spanish in Spain).
   // 'es-419' (Spanish in Latin America) is not available in ICU so that it
   // has to be added manually in GetAvailableLocales().
-  if (base::LowerCaseEqualsASCII(locale_name.substr(0, 3),  "es_"))
+  if (LowerCaseEqualsASCII(locale_name.substr(0, 3),  "es_"))
     return true;
   for (size_t i = 0; i < arraysize(kDuplicateNames); ++i) {
     if (base::strcasecmp(kDuplicateNames[i], locale_name.c_str()) == 0)
       return true;
   }
   return false;
 }
 
 // We added 30+ minimally populated locales with only a few entries
 // (exemplar character set, script, writing direction and its own
@@ skipping 65 matching lines @@
       // and to which Chrome is not localized.
       if (IsLocalePartiallyPopulated(locale_name))
         continue;
       if (!l10n_util::IsLocaleSupportedByOS(locale_name))
         continue;
       // Normalize underscores to hyphens because that's what our locale files
       // use.
       std::replace(locale_name.begin(), locale_name.end(), '_', '-');
 
       // Map the Chinese locale names over to zh-CN and zh-TW.
-      if (base::LowerCaseEqualsASCII(locale_name, "zh-hans")) {
+      if (LowerCaseEqualsASCII(locale_name, "zh-hans")) {
         locale_name = "zh-CN";
-      } else if (base::LowerCaseEqualsASCII(locale_name, "zh-hant")) {
+      } else if (LowerCaseEqualsASCII(locale_name, "zh-hant")) {
         locale_name = "zh-TW";
       }
       locales->push_back(locale_name);
     }
 
     // Manually add 'es-419' to the list. See the comment in IsDuplicateName().
     locales->push_back("es-419");
     return locales;
   }
 };
@@ skipping 32 matching lines @@
   // 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.
   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 (base::LowerCaseEqualsASCII(lang, "es") &&
-        !base::LowerCaseEqualsASCII(region, "es")) {
+    if (LowerCaseEqualsASCII(lang, "es") &&
+        !LowerCaseEqualsASCII(region, "es")) {
       tmp_locale.append("-419");
-    } else if (base::LowerCaseEqualsASCII(lang, "zh")) {
+    } else if (LowerCaseEqualsASCII(lang, "zh")) {
       // Map zh-HK and zh-MO to zh-TW. Otherwise, zh-FOO is mapped to zh-CN.
-      if (base::LowerCaseEqualsASCII(region, "hk") ||
-          base::LowerCaseEqualsASCII(region, "mo")) { // Macao
+      if (LowerCaseEqualsASCII(region, "hk") ||
+          LowerCaseEqualsASCII(region, "mo")) { // Macao
         tmp_locale.append("-TW");
       } else {
         tmp_locale.append("-CN");
       }
-    } else if (base::LowerCaseEqualsASCII(lang, "en")) {
+    } else if (LowerCaseEqualsASCII(lang, "en")) {
       // Map Australian, Canadian, New Zealand and South African English
       // to British English for now.
       // TODO(jungshik): en-CA may have to change sides once
       // we have OS locale separate from app locale (Chrome's UI language).
-      if (base::LowerCaseEqualsASCII(region, "au") ||
-          base::LowerCaseEqualsASCII(region, "ca") ||
-          base::LowerCaseEqualsASCII(region, "nz") ||
-          base::LowerCaseEqualsASCII(region, "za")) {
+      if (LowerCaseEqualsASCII(region, "au") ||
+          LowerCaseEqualsASCII(region, "ca") ||
+          LowerCaseEqualsASCII(region, "nz") ||
+          LowerCaseEqualsASCII(region, "za")) {
         tmp_locale.append("-GB");
       } else {
         tmp_locale.append("-US");
       }
     }
     if (IsLocaleAvailable(tmp_locale)) {
       resolved_locale->swap(tmp_locale);
       return true;
     }
   }
 
   // Google updater uses no, tl, iw and en for our nb, fil, he, and en-US.
   struct {
     const char* source;
     const char* dest;
   } alias_map[] = {
       {"no", "nb"},
       {"tl", "fil"},
       {"iw", "he"},
       {"en", "en-US"},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(alias_map); ++i) {
-    if (base::LowerCaseEqualsASCII(lang, alias_map[i].source)) {
+    if (LowerCaseEqualsASCII(lang, alias_map[i].source)) {
       std::string tmp_locale(alias_map[i].dest);
       if (IsLocaleAvailable(tmp_locale)) {
         resolved_locale->swap(tmp_locale);
         return true;
       }
     }
   }
 
   return false;
 #endif
@@ skipping 473 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;
 }
 
 }  // namespace l10n_util