Prefix string16 with base:: in ui/.

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 6207ffa64e866a04daa50f4de62cba7167454d83..ef530fa4e48458c37c121bd5b369a4f98eec60d8 100644
--- a/ui/base/l10n/l10n_util_unittest.cc
+++ b/ui/base/l10n/l10n_util_unittest.cc
@@ -37,11 +37,11 @@ namespace {
 
 class StringWrapper {
  public:
-  explicit StringWrapper(const string16& string) : string_(string) {}
-  const string16& string() const { return string_; }
+  explicit StringWrapper(const base::string16& string) : string_(string) {}
+  const base::string16& string() const { return string_; }
 
  private:
-  string16 string_;
+  base::string16 string_;
 
   DISALLOW_COPY_AND_ASSIGN(StringWrapper);
 };
@@ -62,7 +62,7 @@ TEST_F(L10nUtilTest, DISABLED_GetString) {
                                 UTF8ToUTF16("10"));
   EXPECT_EQ(std::string("Hello, chrome. Your number is 10."), s);
 
-  string16 s16 = l10n_util::GetStringFUTF16Int(IDS_PLACEHOLDERS_2, 20);
+  base::string16 s16 = l10n_util::GetStringFUTF16Int(IDS_PLACEHOLDERS_2, 20);
   EXPECT_EQ(UTF8ToUTF16("You owe me $20."), s16);
 }
 #endif  // defined(OS_WIN)
@@ -326,7 +326,7 @@ void CheckUiDisplayNameForLocale(const std::string& locale,
                                  const std::string& display_locale,
                                  bool is_rtl) {
   EXPECT_EQ(true, base::i18n::IsRTL());
-  string16 result = l10n_util::GetDisplayNameForLocale(locale,
+  base::string16 result = l10n_util::GetDisplayNameForLocale(locale,
                                                        display_locale,
                                                        /* is_for_ui */ true);
 
@@ -352,7 +352,8 @@ void CheckUiDisplayNameForLocale(const std::string& locale,
 TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
   // TODO(jungshik): Make this test more extensive.
   // Test zh-CN and zh-TW are treated as zh-Hans and zh-Hant.
-  string16 result = l10n_util::GetDisplayNameForLocale("zh-CN", "en", false);
+  base::string16 result =
+      l10n_util::GetDisplayNameForLocale("zh-CN", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Chinese (Simplified Han)"), result);
 
   result = l10n_util::GetDisplayNameForLocale("zh-TW", "en", false);
@@ -388,21 +389,21 @@ TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
   // ToUpper and ToLower should work with embedded NULLs.
   const size_t length_with_null = 4;
   char16 buf_with_null[length_with_null] = { 0, 'a', 0, 'b' };
-  string16 string16_with_null(buf_with_null, length_with_null);
+  base::string16 string16_with_null(buf_with_null, length_with_null);
 
-  string16 upper_with_null = base::i18n::ToUpper(string16_with_null);
+  base::string16 upper_with_null = base::i18n::ToUpper(string16_with_null);
   ASSERT_EQ(length_with_null, upper_with_null.size());
   EXPECT_TRUE(upper_with_null[0] == 0 && upper_with_null[1] == 'A' &&
               upper_with_null[2] == 0 && upper_with_null[3] == 'B');
 
-  string16 lower_with_null = base::i18n::ToLower(upper_with_null);
+  base::string16 lower_with_null = base::i18n::ToLower(upper_with_null);
   ASSERT_EQ(length_with_null, upper_with_null.size());
   EXPECT_TRUE(lower_with_null[0] == 0 && lower_with_null[1] == 'a' &&
               lower_with_null[2] == 0 && lower_with_null[3] == 'b');
 }
 
 TEST_F(L10nUtilTest, GetDisplayNameForCountry) {
-  string16 result = l10n_util::GetDisplayNameForCountry("BR", "en");
+  base::string16 result = l10n_util::GetDisplayNameForCountry("BR", "en");
   EXPECT_EQ(ASCIIToUTF16("Brazil"), result);
 
   result = l10n_util::GetDisplayNameForCountry("419", "en");