Remove wstring from l10n_util. Part 1....

chrome/browser/chromeos/login/language_switch_menu.cc

 // Copyright (c) 2010 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/chromeos/login/language_switch_menu.h"
 
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 29 matching lines @@
   // Update LanguageList to contain entries in current locale.
   language_list_.reset(new LanguageList);
   language_list_->CopySpecifiedLanguagesUp(kLanguagesTopped);
 
   // Clear older menu items.
   menu_model_.Clear();
   menu_model_submenu_.Clear();
 
   // Fill menu items with updated items.
   for (int line = 0; line != kLanguageMainMenuSize; line++) {
-    menu_model_.AddItem(
-        line, WideToUTF16(language_list_->GetLanguageNameAt(line)));
+    menu_model_.AddItem(line, language_list_->GetLanguageNameAt(line));
   }
   menu_model_.AddSeparator();
   menu_model_.AddSubMenuWithStringId(kMoreLanguagesSubMenu,
                                      IDS_LANGUAGES_MORE,
                                      &menu_model_submenu_);
   for (int line = kLanguageMainMenuSize;
        line != language_list_->get_languages_count(); line++) {
     menu_model_submenu_.AddItem(
-        line, WideToUTF16(language_list_->GetLanguageNameAt(line)));
+        line, language_list_->GetLanguageNameAt(line));
   }
 
   // Initialize menu here so it appears fast when called.
   menu_.reset(new views::Menu2(&menu_model_));
 }
 
-std::wstring LanguageSwitchMenu::GetCurrentLocaleName() const {
+string16 LanguageSwitchMenu::GetCurrentLocaleName() const {
   DCHECK(g_browser_process);
   const std::string locale = g_browser_process->GetApplicationLocale();
   int index = language_list_->GetIndexFromLocale(locale);
   CHECK_NE(-1, index) << "Unknown locale: " << locale;
   return language_list_->GetLanguageNameAt(index);
 };
 
 void LanguageSwitchMenu::SetFirstLevelMenuWidth(int width) {
   DCHECK(menu_ != NULL);
   menu_->SetMinimumWidth(width);
@@ skipping 70 matching lines @@
 void LanguageSwitchMenu::ExecuteCommand(int command_id) {
   const std::string locale = language_list_->GetLocaleFromIndex(command_id);
   SwitchLanguage(locale);
   InitLanguageMenu();
 
   // Update all view hierarchies that the locale has changed.
   views::Widget::NotifyLocaleChanged();
 }
 
 }  // namespace chromeos