Remove base version of GetCanonicalLocale() function.

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"
 #include "base/strings/utf_string_conversions.h"
-#include "third_party/icu/source/common/unicode/locid.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 
 namespace {
 
-// Extract language, country and variant, but ignore keywords.  For example,
-// en-US, ca@valencia, ca-ES@valencia.
-std::string GetLocaleString(const icu::Locale& locale) {
-  const char* language = locale.getLanguage();
-  const char* country = locale.getCountry();
-  const char* variant = locale.getVariant();
-
-  std::string result =
-      (language != NULL && *language != '\0') ? language : "und";
-
-  if (country != NULL && *country != '\0') {
-    result += '-';
-    result += country;
-  }
-
-  if (variant != NULL && *variant != '\0') {
-    std::string variant_str(variant);
-    StringToLowerASCII(&variant_str);
-    result += '@' + variant_str;
-  }
-
-  return result;
-}
-
 // Returns LEFT_TO_RIGHT or RIGHT_TO_LEFT if |character| has strong
 // directionality, returns UNKNOWN_DIRECTION if it doesn't. Please refer to
 // http://unicode.org/reports/tr9/ for more information.
 base::i18n::TextDirection GetCharacterDirection(UChar32 character) {
   // Now that we have the character, we use ICU in order to query for the
   // appropriate Unicode BiDi character type.
   int32_t property = u_getIntPropertyValue(character, UCHAR_BIDI_CLASS);
   if ((property == U_RIGHT_TO_LEFT) ||
       (property == U_RIGHT_TO_LEFT_ARABIC) ||
       (property == U_RIGHT_TO_LEFT_EMBEDDING) ||
       (property == U_RIGHT_TO_LEFT_OVERRIDE)) {
     return base::i18n::RIGHT_TO_LEFT;
   } else if ((property == U_LEFT_TO_RIGHT) ||
              (property == U_LEFT_TO_RIGHT_EMBEDDING) ||
              (property == U_LEFT_TO_RIGHT_OVERRIDE)) {
     return base::i18n::LEFT_TO_RIGHT;
   }
   return base::i18n::UNKNOWN_DIRECTION;
 }
 
 }  // namespace
 
 namespace base {
 namespace i18n {
 
 // Represents the locale-specific ICU text direction.
 static TextDirection g_icu_text_direction = UNKNOWN_DIRECTION;
 
+// Extract language, country and variant, but ignore keywords.  For example,
+// en-US, ca@valencia, ca-ES@valencia.
+std::string GetLocaleString(const icu::Locale& locale) {
+  const char* language = locale.getLanguage();
+  const char* country = locale.getCountry();
+  const char* variant = locale.getVariant();
+
+  std::string result =
+      (language != NULL && *language != '\0') ? language : "und";
+
+  if (country != NULL && *country != '\0') {
+    result += '-';
+    result += country;
+  }
+
+  if (variant != NULL && *variant != '\0') {
+    std::string variant_str(variant);
+    StringToLowerASCII(&variant_str);
+    result += '@' + variant_str;
+  }
+
+  return result;
+}
+
 // Convert the ICU default locale to a string.
 std::string GetConfiguredLocale() {
   return GetLocaleString(icu::Locale::getDefault());
 }
 
-// Convert the ICU canonicalized locale to a string.
-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 (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
@@ skipping 294 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