Remove wstring from l10n_util. Part 1....

chrome/browser/default_encoding_combo_model.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/default_encoding_combo_model.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 15 matching lines @@
 
 DefaultEncodingComboboxModel::~DefaultEncodingComboboxModel() {
 }
 
 int DefaultEncodingComboboxModel::GetItemCount() {
   return static_cast<int>(sorted_encoding_list_.size());
 }
 
 string16 DefaultEncodingComboboxModel::GetItemAt(int index) {
   DCHECK(index >= 0 && index < GetItemCount());
-  return WideToUTF16Hack(sorted_encoding_list_[index].encoding_display_name);
+  return sorted_encoding_list_[index].encoding_display_name;
 }
 
 std::string DefaultEncodingComboboxModel::GetEncodingCharsetByIndex(int index) {
   DCHECK(index >= 0 && index < GetItemCount());
   int encoding_id = sorted_encoding_list_[index].encoding_id;
   return CharacterEncoding::GetCanonicalEncodingNameByCommandId(encoding_id);
 }
 
 int DefaultEncodingComboboxModel::GetSelectedEncodingIndex(Profile* profile) {
   StringPrefMember current_encoding_string;
   current_encoding_string.Init(prefs::kDefaultCharset,
                                profile->GetPrefs(),
                                NULL);
   const std::string current_encoding = current_encoding_string.GetValue();
   for (int i = 0; i < GetItemCount(); ++i) {
     if (GetEncodingCharsetByIndex(i) == current_encoding)
       return i;
   }
 
   return 0;
 }