Move two locale functions from rtl.h into l10n_util.h

ui/base/l10n/l10n_util_unittest.cc

Index: ui/base/l10n/l10n_util_unittest.cc
diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc
index cc25d367884584dd1fa3c20dfa37c0b8080635cf..423b8e0e1335b5f8f1d424aabd38b6d5d57b2f13 100644
--- a/ui/base/l10n/l10n_util_unittest.cc
+++ b/ui/base/l10n/l10n_util_unittest.cc
@@ -132,7 +132,7 @@ TEST_F(L10nUtilTest, GetAppLocale) {
   }
 
   // Keep a copy of ICU's default locale before we overwrite it.
-  const std::string original_locale = base::i18n::GetConfiguredLocale();
+  const std::string original_locale = l10n_util::GetConfiguredLocale();
 
   if (kPlatformHasDefaultLocale && kUseLocaleFromEnvironment) {
     env.reset(base::Environment::Create());
@@ -463,7 +463,7 @@ TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
   // direction neutral characters such as parentheses are properly formatted.
 
   // Keep a copy of ICU's default locale before we overwrite it.
-  const std::string original_locale = base::i18n::GetConfiguredLocale();
+  const std::string original_locale = l10n_util::GetConfiguredLocale();
 
   base::i18n::SetICUDefaultLocale("he");
   CheckUiDisplayNameForLocale("en-US", "en", false);