Remove base version of GetCanonicalLocale() function.

base/i18n/rtl.h

Index: base/i18n/rtl.h
diff --git a/base/i18n/rtl.h b/base/i18n/rtl.h
index aa5f6810a9b0a8f38b9870fbc862ec8313ccfa29..666e278426e36324c5314ac2eccb1dadafdef835 100644
--- a/base/i18n/rtl.h
+++ b/base/i18n/rtl.h
@@ -12,6 +12,10 @@
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 
+namespace icu {

[tfarina, 2014/09/08 02:35:20]

forward declaring this namespace does not work in the icu_52 world either.

OK to include locid.h here?

+class Locale;
+}
+
 namespace base {
 
 class FilePath;
@@ -34,14 +38,15 @@ enum TextDirection {
   TEXT_DIRECTION_NUM_DIRECTIONS = 3,
 };
 
+// Extract language, country and variant, but ignore keywords.  For example,
+// en-US, ca@valencia, ca-ES@valencia.
+BASE_I18N_EXPORT std::string GetLocaleString(const icu::Locale& locale);
+
 // Get the locale that the currently running process has been configured to use.
 // The return value is of the form language[-country] (e.g., en-US) where the
 // language is the 2 or 3 letter code from ISO-639.
 BASE_I18N_EXPORT std::string GetConfiguredLocale();
 
-// Canonicalize a string (eg. a POSIX locale string) to a Chrome locale name.
-BASE_I18N_EXPORT std::string GetCanonicalLocale(const char* locale);
-
 // Sets the default locale of ICU.
 // Once the application locale of Chrome in GetApplicationLocale is determined,
 // the default locale of ICU need to be changed to match the application locale