Replace string16 with base::string16.

chrome/browser/chromeos/input_method/input_method_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 "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 83 matching lines @@
     languages.push_back(language_code);
     return InputMethodDescriptor(id,
                                  "",
                                  layouts,
                                  languages,
                                  true,
                                  GURL(),  // options page url
                                  GURL());  // input view page url
   }
 
-  static string16 GetDisplayLanguageName(const std::string& language_code) {
+  static base::string16 GetDisplayLanguageName(const std::string& language_code) {
     return l10n_util::GetDisplayNameForLocale(language_code, "en", true);
   }
 
   FakeInputMethodDelegate delegate_;
   InputMethodWhitelist whitelist_;
   TestableInputMethodUtil util_;
 };
 
 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
   // Test normal cases. Two-letter language code should be returned.
@@ skipping 61 matching lines @@
       "xkb:us:intl:eng",
       "xkb:us:colemak:eng",
       "english-m",
       "xkb:de:neo:ger",
       "xkb:es:cat:cat",
       "xkb:gb:dvorak:eng",
     };
     const int len = ARRAYSIZE_UNSAFE(input_method_id);
     for (int i=0; i<len; ++i) {
       InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "");
-      string16 medium_name = util_.GetInputMethodMediumName(desc);
-      string16 short_name = util_.GetInputMethodShortName(desc);
+      base::string16 medium_name = util_.GetInputMethodMediumName(desc);
+      base::string16 short_name = util_.GetInputMethodShortName(desc);
       EXPECT_EQ(medium_name,short_name);
     }
   }
   {
     // input methods with medium name not equal to short name
     const char * input_method_id[] = {
       "m17n:zh:cangjie",
       "m17n:zh:quick",
       pinyin_ime_id,
       zhuyin_ime_id,
       "mozc-hangul",
       pinyin_ime_id,
       pinyin_ime_id,
     };
     const int len = ARRAYSIZE_UNSAFE(input_method_id);
     for (int i=0; i<len; ++i) {
       InputMethodDescriptor desc = GetDesc(input_method_id[i], "", "");
-      string16 medium_name = util_.GetInputMethodMediumName(desc);
-      string16 short_name = util_.GetInputMethodShortName(desc);
+      base::string16 medium_name = util_.GetInputMethodMediumName(desc);
+      base::string16 short_name = util_.GetInputMethodShortName(desc);
       EXPECT_NE(medium_name,short_name);
     }
   }
 }
 
 TEST_F(InputMethodUtilTest, GetInputMethodLongNameTest) {
   // For most languages input method or keyboard layout name is returned.
   // See below for exceptions.
   {
     InputMethodDescriptor desc = GetDesc("m17n:fa:isiri", "us", "fa");
@@ skipping 242 matching lines @@
   EXPECT_EQ("en-US", language_codes[0]);
   EXPECT_EQ("zh-CN", language_codes[1]);
   EXPECT_EQ("fr", language_codes[2]);
 }
 
 // Test all supported descriptors to detect a typo in ibus_input_methods.txt.
 TEST_F(InputMethodUtilTest, TestIBusInputMethodText) {
   for (size_t i = 0; i < util_.supported_input_methods_->size(); ++i) {
     const std::string language_code =
         util_.supported_input_methods_->at(i).language_codes().at(0);
-    const string16 display_name =
+    const base::string16 display_name =
         l10n_util::GetDisplayNameForLocale(language_code, "en", false);
     // Only two formats, like "fr" (lower case) and "en-US" (lower-upper), are
     // allowed. See the text file for details.
     EXPECT_TRUE(language_code.length() == 2 ||
                 (language_code.length() == 5 && language_code[2] == '-'))
         << "Invalid language code " << language_code;
     EXPECT_TRUE(l10n_util::IsValidLocaleSyntax(language_code))
         << "Invalid language code " << language_code;
     EXPECT_FALSE(display_name.empty())
         << "Invalid language code " << language_code;
     // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
     EXPECT_NE(language_code, UTF16ToUTF8(display_name))
         << "Invalid language code " << language_code;
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos