Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/base/i18n/rtl.cc

 // Copyright (c) 2011 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 "base/i18n/rtl.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 66 matching lines @@
 std::string GetCanonicalLocale(const char* locale) {
   return GetLocaleString(icu::Locale::createCanonical(locale));
 }
 
 // Convert Chrome locale name to ICU locale name
 std::string ICULocaleName(const std::string& locale_string) {
   // If not Spanish, just return it.
   if (locale_string.substr(0, 2) != "es")
     return locale_string;
   // Expand es to es-ES.
-  if (base::LowerCaseEqualsASCII(locale_string, "es"))
+  if (LowerCaseEqualsASCII(locale_string, "es"))
     return "es-ES";
   // Map es-419 (Latin American Spanish) to es-FOO depending on the system
   // locale.  If it's es-RR other than es-ES, map to es-RR. Otherwise, map
   // to es-MX (the most populous in Spanish-speaking Latin America).
-  if (base::LowerCaseEqualsASCII(locale_string, "es-419")) {
+  if (LowerCaseEqualsASCII(locale_string, "es-419")) {
     const icu::Locale& locale = icu::Locale::getDefault();
     std::string language = locale.getLanguage();
     const char* country = locale.getCountry();
-    if (base::LowerCaseEqualsASCII(language, "es") &&
-      !base::LowerCaseEqualsASCII(country, "es")) {
+    if (LowerCaseEqualsASCII(language, "es") &&
+      !LowerCaseEqualsASCII(country, "es")) {
         language += '-';
         language += country;
         return language;
     }
     return "es-MX";
   }
   // Currently, Chrome has only "es" and "es-419", but later we may have
   // more specific "es-RR".
   return locale_string;
 }
@@ skipping 277 matching lines @@
       begin == kRightToLeftOverride)
     ++begin_index;
   size_t end_index = text.length() - 1;
   if (text[end_index] == kPopDirectionalFormatting)
     --end_index;
   return text.substr(begin_index, end_index - begin_index + 1);
 }
 
 }  // namespace i18n
 }  // namespace base