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

chrome/browser/ui/webui/bidi_checker_web_ui_test.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 "chrome/browser/ui/webui/bidi_checker_web_ui_test.h"
 
 #include "base/base_paths.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using autofill::AutofillProfile;
 using autofill::PersonalDataManager;
 
 static const base::FilePath::CharType* kWebUIBidiCheckerLibraryJS =
     FILE_PATH_LITERAL("third_party/bidichecker/bidichecker_packaged.js");
 
 namespace {
 base::FilePath WebUIBidiCheckerLibraryJSPath() {
@@ skipping 73 matching lines @@
 }
 
 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
     const std::string& page_url) {
   WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true);
 }
 
 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
   base::FilePath pak_path;
-  app_locale_ = base::i18n::GetConfiguredLocale();
+  app_locale_ = l10n_util::GetConfiguredLocale();
   ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path));
   pak_path = pak_path.DirName();
   pak_path = pak_path.AppendASCII("pseudo_locales");
   pak_path = pak_path.AppendASCII("fake-bidi");
   pak_path = pak_path.ReplaceExtension(FILE_PATH_LITERAL("pak"));
   ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(pak_path);
   ReloadLocaleResources("he");
   base::i18n::SetICUDefaultLocale("he");
 }
 
@@ skipping 588 matching lines @@
 // chrome://history-frame
 //==============================
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryFrame) {
   RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryFrame) {
   RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
 }