Remove wstring from l10n_util. Part 1....

chrome/browser/ui/toolbar/encoding_menu_controller.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/ui/toolbar/encoding_menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 84 matching lines @@
 
   if (!encoding.empty()) {
     return encoding ==
         CharacterEncoding::GetCanonicalEncodingNameByCommandId(item_id);
   }
 
   return false;
 }
 
 void EncodingMenuController::GetEncodingMenuItems(Profile* profile,
     EncodingMenuItemList* menuItems) {

[Evan Martin, 2010/12/24 01:00:42]

This really should be menu_items, not menuItems.
Not your prob tho

[Avi (use Gerrit), 2010/12/28 15:02:55]

Done anyway.

 
   DCHECK(menuItems);
   EncodingMenuItem separator(0, string16());
 
   menuItems->clear();
   menuItems->push_back(
       EncodingMenuItem(IDC_ENCODING_AUTO_DETECT,
                        l10n_util::GetStringUTF16(IDS_ENCODING_AUTO_DETECT)));
   menuItems->push_back(separator);
 
   // Create current display encoding list.
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
 
   // Build the list of encoding ids : It is made of the
   // locale-dependent short list, the cache of recently selected
   // encodings and other encodings.
   encodings = CharacterEncoding::GetCurrentDisplayEncodings(
       g_browser_process->GetApplicationLocale(),
       profile->GetPrefs()->GetString(prefs::kStaticEncodings),
       profile->GetPrefs()->GetString(prefs::kRecentlySelectedEncoding));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
   // Build up output list for menu.
   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)));
+      menuItems->push_back(EncodingMenuItem(it->encoding_id, encoding));
     } else {
       menuItems->push_back(separator);
     }
   }
 }