Remove wstrings from bookmarks, part 12.

chrome/browser/chromeos/options/language_config_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_UTIL_H_
 #pragma once
 
 #include "app/combobox_model.h"
+#include "base/string16.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "views/controls/combobox/combobox.h"
 
 namespace chromeos {
 
 // The combobox model for Language input method prefs.
 template <typename DataType>
 class LanguageComboboxModel : public ComboboxModel {
  public:
   explicit LanguageComboboxModel(
@@ skipping 11 matching lines @@
       ++num_items_;
     }
   }
 
   // Implements ComboboxModel interface.
   virtual int GetItemCount() {
     return num_items_;
   }
 
   // Implements ComboboxModel interface.
-  virtual std::wstring GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) {
     if (index < 0 || index >= num_items_) {
       LOG(ERROR) << "Index is out of bounds: " << index;
-      return L"";
+      return string16();
     }
     const int message_id = (pref_data_->values_and_ids)[index].item_message_id;
-    return l10n_util::GetString(message_id);
+    return l10n_util::GetStringUTF16(message_id);
   }
 
   // Gets a label for the combobox like "Input mode". This function is NOT part
   // of the ComboboxModel interface.
   std::wstring GetLabel() const {
     return l10n_util::GetString(pref_data_->label_message_id);
   }
 
   // Gets a config value for the ibus configuration daemon (e.g. "KUTEN_TOUTEN",
   // "KUTEN_PERIOD", ..) for an item at zero-origin |index|. This function is
@@ skipping 33 matching lines @@
 
  private:
   static const int kMinComboboxWidth = 250;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageCombobox);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_UTIL_H_