Replace string16 with base::string16.

chrome/browser/character_encoding.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/character_encoding.h"
 
 #include <map>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 234 matching lines @@
     if (!id)
       continue;
     available_list->push_back(id);
     if (available_list->size() == maximum_size)
       return;
   }
 }
 
 string16 GetEncodingDisplayName(const std::string& encoding_name,
                                 int category_string_id) {
-  string16 category_name = l10n_util::GetStringUTF16(category_string_id);
+  base::string16 category_name = l10n_util::GetStringUTF16(category_string_id);
   if (category_string_id != IDS_ENCODING_KOREAN &&
       category_string_id != IDS_ENCODING_THAI &&
       category_string_id != IDS_ENCODING_TURKISH) {
     const CanonicalNameDisplayNameMapType* map =
         CanonicalEncodingMapSingleton()->GetCanonicalNameDisplayNameMapData();
     DCHECK(map);
 
     CanonicalNameDisplayNameMapType::const_iterator found_name =
         map->find(encoding_name);
     DCHECK(found_name != map->end());
@@ skipping 61 matching lines @@
 string16 CharacterEncoding::GetCanonicalEncodingDisplayNameByCommandId(
     int id) {
   const IdToCanonicalEncodingNameMapType* map =
       CanonicalEncodingMapSingleton()->GetIdToCanonicalEncodingNameMapData();
   DCHECK(map);
 
   IdToCanonicalEncodingNameMapType::const_iterator found_name = map->find(id);
   if (found_name != map->end())
     return GetEncodingDisplayName(found_name->second.first,
                                   found_name->second.second);
-  return string16();
+  return base::string16();
 }
 
 // Static.
 // Return count number of all supported canonical encoding.
 int CharacterEncoding::GetSupportCanonicalEncodingCount() {
   return kCanonicalEncodingNamesLength;
 }
 
 // Static.
 std::string CharacterEncoding::GetCanonicalEncodingNameByIndex(int index) {
   if (index < kCanonicalEncodingNamesLength)
     return kCanonicalEncodingNames[index].name;
   return std::string();
 }
 
 // Static.
 string16 CharacterEncoding::GetCanonicalEncodingDisplayNameByIndex(
     int index) {
   if (index < kCanonicalEncodingNamesLength)
     return GetEncodingDisplayName(kCanonicalEncodingNames[index].name,
         kCanonicalEncodingNames[index].category_string_id);
-  return string16();
+  return base::string16();
 }
 
 // Static.
 int CharacterEncoding::GetEncodingCommandIdByIndex(int index) {
   if (index < kCanonicalEncodingNamesLength)
     return kCanonicalEncodingNames[index].resource_id;
   return 0;
 }
 
 // Static.
@@ skipping 163 matching lines @@
   // Insert new encoding to head of selected encoding list.
   *selected_encodings = encoding_name;
   // Generate the string for rest selected encoding list.
   for (std::vector<int>::const_iterator it = selected_encoding_list.begin();
        it != selected_encoding_list.end(); ++it) {
     selected_encodings->append(1, L',');
     selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it));
   }
   return true;
 }