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

chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm

Index: chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm
diff --git a/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm b/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm
index 4f9468f5c5afa88404523f25c749efc667806693..92e576e83e1cd33cdd15516c6eac6e1f938960af 100644
--- a/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm
+++ b/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm
@@ -6,6 +6,7 @@
 
 #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"
@@ -49,13 +50,13 @@ void EncodingMenuControllerDelegate::BuildEncodingMenu(Profile *profile) {
        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);
     }
   }