Reuse base::i18n::SetICUDefaultLocale from rtl.h in some unittests.

base/i18n/number_formatting_unittest.cc

Index: base/i18n/number_formatting_unittest.cc
diff --git a/base/i18n/number_formatting_unittest.cc b/base/i18n/number_formatting_unittest.cc
index c7485d1d2b8d7caee99765ef77a758362b146eff..c40ab34954c117cc0a6a80632f733a5d6b9c1277 100644
--- a/base/i18n/number_formatting_unittest.cc
+++ b/base/i18n/number_formatting_unittest.cc
@@ -5,21 +5,13 @@
 #include <limits>
 
 #include "base/i18n/number_formatting.h"
+#include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "unicode/locid.h"
 
+namespace base {
 namespace {
 
-void SetICUDefaultLocale(const std::string& locale_string) {
-  icu::Locale locale(locale_string.c_str());
-  UErrorCode error_code = U_ZERO_ERROR;
-  icu::Locale::setDefault(locale, error_code);
-  EXPECT_TRUE(U_SUCCESS(error_code));
-}
-
-}  // namespace
-
 TEST(NumberFormattingTest, FormatNumber) {
   static const struct {
     int64 number;
@@ -36,14 +28,14 @@ TEST(NumberFormattingTest, FormatNumber) {
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
-    SetICUDefaultLocale("en");
-    base::testing::ResetFormatters();
+    i18n::SetICUDefaultLocale("en");
+    testing::ResetFormatters();
     EXPECT_EQ(cases[i].expected_english,
-              UTF16ToUTF8(base::FormatNumber(cases[i].number)));
-    SetICUDefaultLocale("de");
-    base::testing::ResetFormatters();
+              UTF16ToUTF8(FormatNumber(cases[i].number)));
+    i18n::SetICUDefaultLocale("de");
+    testing::ResetFormatters();
     EXPECT_EQ(cases[i].expected_german,
-              UTF16ToUTF8(base::FormatNumber(cases[i].number)));
+              UTF16ToUTF8(FormatNumber(cases[i].number)));
   }
 }
 
@@ -81,15 +73,16 @@ TEST(NumberFormattingTest, FormatDouble) {
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
-  SetICUDefaultLocale("en");
-  base::testing::ResetFormatters();
-  EXPECT_EQ(cases[i].expected_english,
-            UTF16ToUTF8(base::FormatDouble(cases[i].number,
-                                           cases[i].frac_digits)));
-  SetICUDefaultLocale("de");
-  base::testing::ResetFormatters();
-  EXPECT_EQ(cases[i].expected_german,
-            UTF16ToUTF8(base::FormatDouble(cases[i].number,
-                                           cases[i].frac_digits)));
+    i18n::SetICUDefaultLocale("en");
+    testing::ResetFormatters();
+    EXPECT_EQ(cases[i].expected_english,
+              UTF16ToUTF8(FormatDouble(cases[i].number, cases[i].frac_digits)));
+    i18n::SetICUDefaultLocale("de");
+    testing::ResetFormatters();
+    EXPECT_EQ(cases[i].expected_german,
+              UTF16ToUTF8(FormatDouble(cases[i].number, cases[i].frac_digits)));
   }
 }
+
+}  // namespace
+}  // namespace base