Remove base version of GetCanonicalLocale() function.

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 290 matching lines @@
 };
 
 base::LazyInstance<std::vector<std::string>, AvailableLocalesTraits>
     g_available_locales = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace l10n_util {
 
 std::string GetCanonicalLocale(const std::string& locale) {
-  return base::i18n::GetCanonicalLocale(locale.c_str());
+  return base::i18n::GetLocaleString(
+      icu::Locale::createCanonical(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)
@@ skipping 132 matching lines @@
   // GLib implements correct environment variable parsing with
   // the precedence order: LANGUAGE, LC_ALL, LC_MESSAGES and LANG.
   // We used to use our custom parsing code along with ICU for this purpose.
   // If we have a port that does not depend on GTK, we have to
   // restore our custom code for that port.
   const char* const* languages = g_get_language_names();
   DCHECK(languages);  // A valid pointer is guaranteed.
   DCHECK(*languages);  // At least one entry, "C", is guaranteed.
 
   for (; *languages != NULL; ++languages) {
-    candidates.push_back(base::i18n::GetCanonicalLocale(*languages));
+    candidates.push_back(GetCanonicalLocale(*languages));
   }
 
 #else
 
   // By default, use the application locale preference. This applies to ChromeOS
   // and linux systems without glib.
   if (!pref_locale.empty())
     candidates.push_back(pref_locale);
 
 #endif
@@ skipping 400 matching lines @@
 
 const char* const* GetAcceptLanguageListForTesting() {
   return kAcceptLanguageList;
 }
 
 size_t GetAcceptLanguageListSizeForTesting() {
   return arraysize(kAcceptLanguageList);
 }
 
 }  // namespace l10n_util