Replace string16 with base::string16.

chrome/browser/character_encoding.h

Index: chrome/browser/character_encoding.h
diff --git a/chrome/browser/character_encoding.h b/chrome/browser/character_encoding.h
index e043012f34cc97d762de61ab8ced7238f95ca651..6730b0719f13349cf6a039a7192a4a5a72cd50e0 100644
--- a/chrome/browser/character_encoding.h
+++ b/chrome/browser/character_encoding.h
@@ -24,14 +24,14 @@ class CharacterEncoding {
     // l10n_util::SortVectorWithStringKey to sort the encoding menu items
     // by current locale character sequence. We need to keep the order within
     // encoding category name, that's why we use category name as key.
-    const string16& GetStringKey() const { return encoding_category_name; }
+    const base::string16& GetStringKey() const { return encoding_category_name; }
 
     // Encoding command id.
     int encoding_id;
     // Encoding display name.
-    string16 encoding_display_name;
+    base::string16 encoding_display_name;
     // Encoding category name.
-    string16 encoding_category_name;
+    base::string16 encoding_category_name;
   };
 
   // Return canonical encoding name according to the command ID.
@@ -42,7 +42,7 @@ class CharacterEncoding {
   // Return display name of canonical encoding according to the command
   // ID. THIS FUNCTION IS NOT THREADSAFE. You must run this function
   // only in UI thread.
-  static string16 GetCanonicalEncodingDisplayNameByCommandId(int id);
+  static base::string16 GetCanonicalEncodingDisplayNameByCommandId(int id);
 
   // Return count number of all supported canonical encoding.
   static int GetSupportCanonicalEncodingCount();
@@ -56,7 +56,7 @@ class CharacterEncoding {
   // which starts from zero to GetSupportCanonicalEncodingCount() - 1.
   // THIS FUNCTION IS NOT THREADSAFE. You must run this function
   // only in UI thread.
-  static string16 GetCanonicalEncodingDisplayNameByIndex(int index);
+  static base::string16 GetCanonicalEncodingDisplayNameByIndex(int index);
 
   // Return encoding command id according to the index, which starts from
   // zero to GetSupportCanonicalEncodingCount() - 1. Otherwise returns 0.