Remove wstrings from bookmarks, part 12.

chrome/browser/chromeos/options/language_config_model.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/options/language_config_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 13 matching lines @@
     Profile* profile,
     const std::vector<std::string>& locale_codes)
     : LanguageComboboxModel(profile, locale_codes) {
 }
 
 int AddLanguageComboboxModel::GetItemCount() {
   // +1 for "Add language".
   return get_languages_count() + 1 - ignore_set_.size();
 }
 
-std::wstring AddLanguageComboboxModel::GetItemAt(int index) {
+string16 AddLanguageComboboxModel::GetItemAt(int index) {
   // Show "Add language" as the first item.
   if (index == 0) {
-    return l10n_util::GetString(
+    return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX);
   }
-  return GetLanguageNameAt(GetLanguageIndex(index));
+  return WideToUTF16Hack(GetLanguageNameAt(GetLanguageIndex(index)));
 }
 
 int AddLanguageComboboxModel::GetLanguageIndex(int index) const {
   // The adjusted_index is counted while ignoring languages in ignore_set_.
   int adjusted_index = 0;
   for (int i = 0; i < get_languages_count(); ++i) {
     if (ignore_set_.count(GetLocaleFromIndex(i)) > 0) {
       continue;
     }
     // -1 for "Add language".
@@ skipping 216 matching lines @@
   }
 
   // Build the vectors from the sets.
   supported_language_codes_.assign(supported_language_code_set.begin(),
                                    supported_language_code_set.end());
   supported_input_method_ids_.assign(supported_input_method_id_set.begin(),
                                      supported_input_method_id_set.end());
 }
 
 }  // namespace chromeos