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

chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm

 // 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/cocoa/encoding_menu_controller_delegate_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/profile.h"
 
 namespace {
 
 void AddSeparatorToMenu(NSMenu *parent_menu) {
   NSMenuItem* separator = [NSMenuItem separatorItem];
@@ skipping 23 matching lines @@
 
   typedef EncodingMenuController::EncodingMenuItemList EncodingMenuItemList;
   EncodingMenuItemList menuItems;
   EncodingMenuController controller;
   controller.GetEncodingMenuItems(profile, &menuItems);
 
   for (EncodingMenuItemList::iterator it = menuItems.begin();
        it != menuItems.end();
        ++it) {
     int item_id = it->first;
-    std::wstring &localized_title_wstring = it->second;
+    string16 &localized_title_string16 = it->second;
 
     if (item_id == 0) {
       AddSeparatorToMenu(encoding_menu);
     } else {
       using base::SysWideToNSString;
-      NSString *localized_title = SysWideToNSString(localized_title_wstring);
+      NSString *localized_title = SysUTF16ToNSString(localized_title_string16);
       AppendMenuItem(encoding_menu, item_id, localized_title);
     }
   }
 
 }