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

chrome/browser/ui/views/tabs/tab_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 "chrome/browser/ui/views/tabs/tab.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/tabs/tab_utils.h"
 #include "chrome/browser/ui/views/tabs/media_indicator_button.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using views::Widget;
 
 class FakeTabController : public TabController {
  public:
@@ skipping 48 matching lines @@
 class TabTest : public views::ViewsTestBase,
                 public ::testing::WithParamInterface<bool> {
  public:
   TabTest() {}
   virtual ~TabTest() {}
 
   bool testing_for_rtl_locale() const { return GetParam(); }
 
   void SetUp() override {
     if (testing_for_rtl_locale()) {
-      original_locale_ = base::i18n::GetConfiguredLocale();
+      original_locale_ = l10n_util::GetConfiguredLocale();
       base::i18n::SetICUDefaultLocale("he");
     }
     views::ViewsTestBase::SetUp();
   }
 
   void TearDown() override {
     views::ViewsTestBase::TearDown();
     if (testing_for_rtl_locale())
       base::i18n::SetICUDefaultLocale(original_locale_);
   }
@@ skipping 292 matching lines @@
   EXPECT_EQ(50, tab.close_button_->bounds().height());
 }
 
 // Test in both a LTR and a RTL locale.  Note: The fact that the UI code is
 // configured for an RTL locale does *not* change how the coordinates are
 // examined in the tests above because views::View and friends are supposed to
 // auto-mirror the widgets when painting.  Thus, what we're testing here is that
 // there's no code in Tab that will erroneously subvert this automatic
 // coordinate translation.  http://crbug.com/384179
 INSTANTIATE_TEST_CASE_P(, TabTest, ::testing::Values(false, true));