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

ui/base/l10n/l10n_util_unittest.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 "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cstdlib>
 #endif
 
@@ skipping 114 matching lines @@
     "ca@valencia",
   };
 
   for (size_t i = 0; i < arraysize(filenames); ++i) {
     base::FilePath filename = new_locale_dir.AppendASCII(
         filenames[i] + ".pak");
     base::WriteFile(filename, "", 0);
   }
 
   // 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());
 
     // Test the support of LANGUAGE environment variable.
     base::i18n::SetICUDefaultLocale("en-US");
     env->SetVar("LANGUAGE", "xx:fr_CA");
     EXPECT_EQ("fr", l10n_util::GetApplicationLocale(std::string()));
     EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
 
@@ skipping 310 matching lines @@
   result = l10n_util::GetDisplayNameForLocale("-BR", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Brazil"), result);
 
   result = l10n_util::GetDisplayNameForLocale("xyz-xyz", "en", false);
   EXPECT_EQ(ASCIIToUTF16("xyz (XYZ)"), result);
 
   // Check for directional markers when using RTL languages to ensure that
   // 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);
   CheckUiDisplayNameForLocale("en-US", "he", true);
 
   // Clean up.
   base::i18n::SetICUDefaultLocale(original_locale);
 
   // ToUpper and ToLower should work with embedded NULLs.
   const size_t length_with_null = 4;
@@ skipping 80 matching lines @@
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("Latin"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("German"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("pt--BR"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("sl-macedonia"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x="));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@=y"));
 }