Remove wstring from l10n_util. Part 1....

chrome/browser/character_encoding.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
@@ skipping 275 matching lines @@
   int category_id = GetEncodingCategoryStringIdByCommandId(id);
   if (category_id)
     return l10n_util::GetStringUTF8(category_id);
   return std::string();
 }
 
 }  // namespace
 
 CharacterEncoding::EncodingInfo::EncodingInfo(int id)
     : encoding_id(id) {
-  encoding_category_name = UTF8ToWide(GetEncodingCategoryStringByCommandId(id));
-  encoding_display_name = UTF16ToWideHack(
-      GetCanonicalEncodingDisplayNameByCommandId(id));
+  encoding_category_name =
+      UTF8ToUTF16(GetEncodingCategoryStringByCommandId(id));

[Evan Martin, 2010/12/24 01:00:42]

one line?

+  encoding_display_name = GetCanonicalEncodingDisplayNameByCommandId(id);
 }
 
 // Static.
 int CharacterEncoding::GetCommandIdByCanonicalEncodingName(
     const std::string& encoding_name) {
   const CanonicalEncodingNameToIdMapType* map =
       canonical_encoding_name_map_singleton.
           GetCanonicalEncodingNameToIdMapData();
   DCHECK(map);
 
@@ skipping 229 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;
 }