Replace string16 with base::string16.

chrome/browser/chromeos/input_method/input_method_util.h

Index: chrome/browser/chromeos/input_method/input_method_util.h
diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h
index 6f70fea4e94d256afe51d663e1cb0f55f9327c97..32f3efbc177d4163c19cc8dcb538a00256da63b3 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.h
+++ b/chrome/browser/chromeos/input_method/input_method_util.h
@@ -39,7 +39,7 @@ class InputMethodUtil {
   // into Chrome's string ID, then pulls internationalized resource string from
   // the resource bundle and returns it. These functions are not thread-safe.
   // Non-UI threads are not allowed to call them.
-  string16 TranslateString(const std::string& english_string) const;
+  base::string16 TranslateString(const std::string& english_string) const;
 
   // Converts an input method ID to a language code of the IME. Returns "Eng"
   // when |input_method_id| is unknown.
@@ -53,11 +53,11 @@ class InputMethodUtil {
   std::string GetInputMethodDisplayNameFromId(
       const std::string& input_method_id) const;
 
-  string16 GetInputMethodShortName(
+  base::string16 GetInputMethodShortName(
       const InputMethodDescriptor& input_method) const;
-  string16 GetInputMethodMediumName(
+  base::string16 GetInputMethodMediumName(
       const InputMethodDescriptor& input_method) const;
-  string16 GetInputMethodLongName(
+  base::string16 GetInputMethodLongName(
       const InputMethodDescriptor& input_method) const;
 
   // Converts an input method ID to an input method descriptor. Returns NULL
@@ -140,7 +140,7 @@ class InputMethodUtil {
 
  private:
   bool TranslateStringInternal(const std::string& english_string,
-                               string16 *out_string) const;
+                               base::string16 *out_string) const;
 
   // Map from language code to associated input method IDs, etc.
   typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;