Replace string16 with base::string16.

chrome/browser/chromeos/input_method/input_method_util.cc

Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 01be20b17738f9de666caa85c6c3f23bb58d089f..8bc71acebb77d7b5839fb37695a0c03223c94616 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -316,7 +316,7 @@ InputMethodUtil::~InputMethodUtil() {
 }
 
 bool InputMethodUtil::TranslateStringInternal(
-    const std::string& english_string, string16 *out_string) const {
+    const std::string& english_string, base::string16 *out_string) const {
   DCHECK(out_string);
   HashType::const_iterator iter = english_to_resource_id_.find(english_string);
   if (iter == english_to_resource_id_.end()) {
@@ -331,9 +331,9 @@ bool InputMethodUtil::TranslateStringInternal(
   return true;
 }
 
-string16 InputMethodUtil::TranslateString(
+base::string16 InputMethodUtil::TranslateString(
     const std::string& english_string) const {
-  string16 localized_string;
+  base::string16 localized_string;
   if (TranslateStringInternal(english_string, &localized_string)) {
     return localized_string;
   }
@@ -377,7 +377,7 @@ std::string InputMethodUtil::GetKeyboardLayoutName(
 
 std::string InputMethodUtil::GetInputMethodDisplayNameFromId(
     const std::string& input_method_id) const {
-  string16 display_name;
+  base::string16 display_name;
   if (!extension_ime_util::IsExtensionIME(input_method_id) &&
       TranslateStringInternal(input_method_id, &display_name)) {
     return UTF16ToUTF8(display_name);
@@ -386,11 +386,11 @@ std::string InputMethodUtil::GetInputMethodDisplayNameFromId(
   return "";
 }
 
-string16 InputMethodUtil::GetInputMethodShortName(
+base::string16 InputMethodUtil::GetInputMethodShortName(
     const InputMethodDescriptor& input_method) const {
   // For the status area, we use two-letter, upper-case language code like
   // "US" and "JP".
-  string16 text;
+  base::string16 text;
 
   // Check special cases first.
   for (size_t i = 0; i < kMappingFromIdToIndicatorTextLen; ++i) {
@@ -404,7 +404,7 @@ string16 InputMethodUtil::GetInputMethodShortName(
   if (text.empty() &&
       IsKeyboardLayout(input_method.id())) {
     const size_t kMaxKeyboardLayoutNameLen = 2;
-    const string16 keyboard_layout =
+    const base::string16 keyboard_layout =
         UTF8ToUTF16(GetKeyboardLayoutName(input_method.id()));
     text = StringToUpperASCII(keyboard_layout).substr(
         0, kMaxKeyboardLayoutNameLen);
@@ -427,7 +427,7 @@ string16 InputMethodUtil::GetInputMethodShortName(
   return text;
 }
 
-string16 InputMethodUtil::GetInputMethodMediumName(
+base::string16 InputMethodUtil::GetInputMethodMediumName(
     const InputMethodDescriptor& input_method) const {
   // For the "Your input method has changed to..." bubble. In most cases
   // it uses the same name as the short name, unless found in a table
@@ -442,7 +442,7 @@ string16 InputMethodUtil::GetInputMethodMediumName(
   return GetInputMethodShortName(input_method);
 }
 
-string16 InputMethodUtil::GetInputMethodLongName(
+base::string16 InputMethodUtil::GetInputMethodLongName(
     const InputMethodDescriptor& input_method) const {
   if (!input_method.name().empty()) {
     // If the descriptor has a name, use it.
@@ -456,17 +456,18 @@ string16 InputMethodUtil::GetInputMethodLongName(
   // keyboard layouts and share the same layout of keyboard (Belgian). We need
   // to show explicitly the language for the layout. For Arabic, Amharic, and
   // Indic languages: they share "Standard Input Method".
-  const string16 standard_input_method_text = delegate_->GetLocalizedString(
-      IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD);
+  const base::string16 standard_input_method_text =
+      delegate_->GetLocalizedString(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD);
   DCHECK(!input_method.language_codes().empty());
   const std::string language_code = input_method.language_codes().at(0);
 
-  string16 text = TranslateString(input_method.id());
+  base::string16 text = TranslateString(input_method.id());
   if (text == standard_input_method_text ||
              language_code == "de" ||
              language_code == "fr" ||
              language_code == "nl") {
-    const string16 language_name = delegate_->GetDisplayLanguageName(
+    const base::string16 language_name = delegate_->GetDisplayLanguageName(
         language_code);
 
     text = language_name + UTF8ToUTF16(" - ") + text;