Convert std::wstring encoding names to std::string in a bunch of files.

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2009 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/views/toolbar_view.h"
 
 #include <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 80 matching lines @@
   EncodingMenuController::EncodingMenuItemList encoding_menu_items;
   EncodingMenuController encoding_menu_controller;
   encoding_menu_controller.GetEncodingMenuItems(browser_->profile(),
                                                 &encoding_menu_items);
 
   int group_id = 0;
   EncodingMenuController::EncodingMenuItemList::iterator it =
       encoding_menu_items.begin();
   for (; it != encoding_menu_items.end(); ++it) {
     int id = it->first;
-    std::wstring& label = it->second;
+    string16& label = it->second;
     if (id == 0) {
       AddSeparator();
     } else {
       if (id == IDC_ENCODING_AUTO_DETECT) {
-        AddCheckItem(id, WideToUTF16Hack(label));
+        AddCheckItem(id, label);
       } else {
         // Use the id of the first radio command as the id of the group.
         if (group_id <= 0)
           group_id = id;
-        AddRadioItem(id, WideToUTF16Hack(label), group_id);
+        AddRadioItem(id, label, group_id);
       }
     }
   }
 }
 
 bool EncodingMenuModel::IsCommandIdChecked(int command_id) const {
   TabContents* current_tab = browser_->GetSelectedTabContents();
   EncodingMenuController controller;
   return controller.IsItemChecked(browser_->profile(),
                                   current_tab->encoding(), command_id);
@@ skipping 977 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }