Remove wstring from l10n_util. Part 1.

BUG=9911
TEST=no visible changes; all tests pass

Review URL: http://codereview.chromium.org/5990008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70224 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 10 deletions

diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc
index c93fb1e..177aa28 100644
--- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc
+++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc
@@ -102,16 +102,16 @@ bool EncodingMenuController::IsItemChecked(
 }
 
 void EncodingMenuController::GetEncodingMenuItems(Profile* profile,
-    EncodingMenuItemList* menuItems) {
+    EncodingMenuItemList* menu_items) {
 
-  DCHECK(menuItems);
+  DCHECK(menu_items);
   EncodingMenuItem separator(0, string16());
 
-  menuItems->clear();
-  menuItems->push_back(
+  menu_items->clear();
+  menu_items->push_back(
       EncodingMenuItem(IDC_ENCODING_AUTO_DETECT,
                        l10n_util::GetStringUTF16(IDS_ENCODING_AUTO_DETECT)));
-  menuItems->push_back(separator);
+  menu_items->push_back(separator);
 
   // Create current display encoding list.
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
@@ -130,12 +130,11 @@ void EncodingMenuController::GetEncodingMenuItems(Profile* profile,
   std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     if (it->encoding_id) {
-      std::wstring encoding = it->encoding_display_name;
+      string16 encoding = it->encoding_display_name;
       base::i18n::AdjustStringForLocaleDirection(&encoding);
-      menuItems->push_back(EncodingMenuItem(it->encoding_id,
-                                            WideToUTF16(encoding)));
+      menu_items->push_back(EncodingMenuItem(it->encoding_id, encoding));
     } else {
-      menuItems->push_back(separator);
+      menu_items->push_back(separator);
     }
   }
 }
diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.h b/chrome/browser/ui/toolbar/encoding_menu_controller.h
index bfa8c57..b927778 100644
--- a/chrome/browser/ui/toolbar/encoding_menu_controller.h
+++ b/chrome/browser/ui/toolbar/encoding_menu_controller.h
@@ -42,7 +42,7 @@ class EncodingMenuController {
   // Fills in a list of menu items in the order they should appear in the menu.
   // Items whose ids are 0 are separators.
   void GetEncodingMenuItems(Profile* profile,
-                            EncodingMenuItemList* menuItems);
+                            EncodingMenuItemList* menu_items);
 
  private:
   // List of all valid encoding GUI IDs.