Remove wstrings from bookmarks, part 12.

- This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16
  instead of a wstring.
- This entailed changing the base class, ComboboxModel, and shaving a herd of
  yaks.

BUG=23581
TEST=builds and passes tests

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

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

32 files changed, 130 insertions, 100 deletions

diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index cd6bfc1..529a6ae 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -53,10 +53,10 @@ int RecentlyUsedFoldersComboModel::GetItemCount() {
   return static_cast<int>(nodes_.size() + 1);
 }
 
-std::wstring RecentlyUsedFoldersComboModel::GetItemAt(int index) {
+string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) {
   if (index == static_cast<int>(nodes_.size()))
-    return l10n_util::GetString(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
-  return nodes_[index]->GetTitle();
+    return l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
+  return nodes_[index]->GetTitleAsString16();
 }
 
 const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) {
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
index 21bd9b7..adf36a9 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "app/combobox_model.h"
+#include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 // Model for the combobox showing the list of folders to choose from. The
@@ -20,7 +21,7 @@ class RecentlyUsedFoldersComboModel : public ComboboxModel {
 
   // Overridden from ComboboxModel:
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // Returns the node at the specified |index|.
   const BookmarkNode* GetNodeAt(int index);
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 2851966..93c4d3f 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/login/network_screen.h"
 
 #include "app/l10n_util.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -54,21 +55,21 @@ int NetworkScreen::GetItemCount() {
       (wifi_disabled_ ? 1 : 0);
 }
 
-std::wstring NetworkScreen::GetItemAt(int index) {
+string16 NetworkScreen::GetItemAt(int index) {
   if (index == 0) {
     return networks_.IsEmpty() ?
-        l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE) :
-        l10n_util::GetString(IDS_NETWORK_SELECTION_NONE);
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE) :
+        l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_NONE);
   }
   if (wifi_disabled_ &&
       index == static_cast<int>(networks_.GetNetworkCount()) + 1) {
-    return l10n_util::GetStringF(
+    return l10n_util::GetStringFUTF16(
         IDS_STATUSBAR_NETWORK_DEVICE_ENABLE,
-        l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_WIFI));
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_WIFI));
   }
   NetworkList::NetworkItem* network =
       networks_.GetNetworkAt(index - 1);
-  return network ? UTF16ToWide(network->label) : std::wstring();
+  return network ? network->label : string16();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h
index 194607a..f272a1a 100644
--- a/chrome/browser/chromeos/login/network_screen.h
+++ b/chrome/browser/chromeos/login/network_screen.h
@@ -6,10 +6,9 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
 #pragma once
 
-#include <string>
-
 #include "base/task.h"
 #include "base/timer.h"
+#include "base/string16.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
@@ -37,7 +36,7 @@ class NetworkScreen : public ViewScreen<NetworkSelectionView>,
 
   // ComboboxModel implementation:
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // views::Combobox::Listener implementation:
   virtual void ItemChanged(views::Combobox* sender,
diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc
index 5bcbedc..8e52bd4 100644
--- a/chrome/browser/chromeos/login/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc
@@ -8,6 +8,7 @@
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -47,8 +48,8 @@ class DummyComboboxModel : public ComboboxModel {
  public:
   virtual int GetItemCount() { return 2; }
 
-  virtual std::wstring GetItemAt(int index) {
-    return L"Item " + UTF16ToWideHack(base::IntToString16(index));
+  virtual string16 GetItemAt(int index) {
+    return ASCIIToUTF16("Item ") + base::IntToString16(index);
   }
 };
 
@@ -208,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Basic) {
   NetworkSelectionView* network_view = network_screen->view();
   ASSERT_TRUE(network_view != NULL);
   ASSERT_EQ(1, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
             network_screen->GetItemAt(0));
 }
 
@@ -228,10 +229,10 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, EnableWifi) {
   WifiCellularNetworksExpectations();
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
             network_screen->GetItemAt(0));
-  EXPECT_EQ(l10n_util::GetStringF(IDS_STATUSBAR_NETWORK_DEVICE_ENABLE,
-                l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_WIFI)),
+  EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ENABLE,
+                l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_WIFI)),
             network_screen->GetItemAt(1));
 
   // Emulate "Enable Wifi" item press.
@@ -262,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, NetworksConnectedNotSelected) {
   EXPECT_EQ(1, network_view->GetSelectedNetworkItem());
   ASSERT_EQ(network_screen, controller()->current_screen());
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
             network_screen->GetItemAt(1));
 
   // Ethernet - disconnected, WiFi & Cellular - connected.
@@ -278,8 +279,8 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, NetworksConnectedNotSelected) {
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(network_screen, controller()->current_screen());
   ASSERT_EQ(3, network_screen->GetItemCount());
-  EXPECT_EQ(ASCIIToWide(wifi_.name()), network_screen->GetItemAt(1));
-  EXPECT_EQ(ASCIIToWide(cellular_.name()), network_screen->GetItemAt(2));
+  EXPECT_EQ(ASCIIToUTF16(wifi_.name()), network_screen->GetItemAt(1));
+  EXPECT_EQ(ASCIIToUTF16(cellular_.name()), network_screen->GetItemAt(2));
 
   // Ethernet, WiFi & Cellular - connected.
   EthernetExpectations(true, false);
@@ -292,10 +293,10 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, NetworksConnectedNotSelected) {
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(network_screen, controller()->current_screen());
   ASSERT_EQ(4, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
             network_screen->GetItemAt(1));
-  EXPECT_EQ(ASCIIToWide(wifi_.name()), network_screen->GetItemAt(2));
-  EXPECT_EQ(ASCIIToWide(cellular_.name()), network_screen->GetItemAt(3));
+  EXPECT_EQ(ASCIIToUTF16(wifi_.name()), network_screen->GetItemAt(2));
+  EXPECT_EQ(ASCIIToUTF16(cellular_.name()), network_screen->GetItemAt(3));
   // Ethernet is only preselected once.
   EXPECT_EQ(0, network_view->GetSelectedNetworkItem());
 }
@@ -315,7 +316,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, EthernetSelected) {
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
             network_screen->GetItemAt(1));
   ASSERT_EQ(network_screen, controller()->current_screen());
 
@@ -356,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, WifiSelected) {
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(ASCIIToWide(wifi_.name()), network_screen->GetItemAt(1));
+  EXPECT_EQ(ASCIIToUTF16(wifi_.name()), network_screen->GetItemAt(1));
 
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
@@ -417,7 +418,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CellularSelected) {
   NetworkChangedExpectations(true);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(2, network_screen->GetItemCount());
-  EXPECT_EQ(ASCIIToWide(cellular_.name()), network_screen->GetItemAt(1));
+  EXPECT_EQ(ASCIIToUTF16(cellular_.name()), network_screen->GetItemAt(1));
 
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc
index c6247a0..3e4ac6f 100644
--- a/chrome/browser/chromeos/options/language_config_model.cc
+++ b/chrome/browser/chromeos/options/language_config_model.cc
@@ -31,13 +31,13 @@ int AddLanguageComboboxModel::GetItemCount() {
   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 {
diff --git a/chrome/browser/chromeos/options/language_config_model.h b/chrome/browser/chromeos/options/language_config_model.h
index 4310f77..031e90e 100644
--- a/chrome/browser/chromeos/options/language_config_model.h
+++ b/chrome/browser/chromeos/options/language_config_model.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/string16.h"
 #include "chrome/browser/language_combobox_model.h"
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/pref_service.h"
@@ -27,7 +28,7 @@ class AddLanguageComboboxModel : public ::LanguageComboboxModel {
                            const std::vector<std::string>& locale_codes);
   // LanguageComboboxModel overrides.
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // Converts the given index (index of the items in the combobox) to the
   // index of the internal language list. The returned index can be used
diff --git a/chrome/browser/chromeos/options/language_config_model_unittest.cc b/chrome/browser/chromeos/options/language_config_model_unittest.cc
index e9b593d..0d7e12f 100644
--- a/chrome/browser/chromeos/options/language_config_model_unittest.cc
+++ b/chrome/browser/chromeos/options/language_config_model_unittest.cc
@@ -26,18 +26,18 @@ TEST(AddLanguageComboboxModelTest, AddLanguageComboboxModel) {
   ASSERT_EQ(4, model.GetItemCount());
 
   // The first item should be "Add language" labe.
-  EXPECT_EQ(l10n_util::GetString(
+  EXPECT_EQ(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX),
             model.GetItemAt(0));
   // Other items should be sorted language display names for UI (hence
   // French comes before German).  Note that the returned display names
   // are followed by their native representations. To simplify matching,
   // use StartsWith() here.
-  EXPECT_TRUE(StartsWith(model.GetItemAt(1), L"French", true))
+  EXPECT_TRUE(StartsWith(model.GetItemAt(1), ASCIIToUTF16("French"), true))
       << model.GetItemAt(1);
-  EXPECT_TRUE(StartsWith(model.GetItemAt(2), L"German", true))
+  EXPECT_TRUE(StartsWith(model.GetItemAt(2), ASCIIToUTF16("German"), true))
       << model.GetItemAt(2);
-  EXPECT_TRUE(StartsWith(model.GetItemAt(3), L"Korean", true))
+  EXPECT_TRUE(StartsWith(model.GetItemAt(3), ASCIIToUTF16("Korean"), true))
       << model.GetItemAt(3);
 
   // GetLanguageIndex() returns the given index -1 to offset "Add language".
diff --git a/chrome/browser/chromeos/options/language_config_util.h b/chrome/browser/chromeos/options/language_config_util.h
index 21a5705..6f262cf 100644
--- a/chrome/browser/chromeos/options/language_config_util.h
+++ b/chrome/browser/chromeos/options/language_config_util.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "app/combobox_model.h"
+#include "base/string16.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "views/controls/combobox/combobox.h"
 
@@ -38,13 +39,13 @@ class LanguageComboboxModel : public ComboboxModel {
   }
 
   // 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
diff --git a/chrome/browser/chromeos/options/language_hangul_config_view.cc b/chrome/browser/chromeos/options/language_hangul_config_view.cc
index 29991c6..14677f6 100644
--- a/chrome/browser/chromeos/options/language_hangul_config_view.cc
+++ b/chrome/browser/chromeos/options/language_hangul_config_view.cc
@@ -6,6 +6,7 @@
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
@@ -43,12 +44,12 @@ class HangulKeyboardComboboxModel : public ComboboxModel {
   }
 
   // Implements ComboboxModel interface.
-  virtual std::wstring GetItemAt(int index) {
+  virtual string16 GetItemAt(int index) {
     if (index < 0 || index > GetItemCount()) {
       LOG(ERROR) << "Index is out of bounds: " << index;
-      return L"";
+      return string16();
     }
-    return UTF8ToWide(layouts_.at(index).first);
+    return UTF8ToUTF16(layouts_.at(index).first);
   }
 
   // Gets a keyboard layout ID (e.g. "2", "3f", ..) for an item at zero-origin
diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc
index c6fb721..ef7be1c 100644
--- a/chrome/browser/chromeos/options/system_page_view.cc
+++ b/chrome/browser/chromeos/options/system_page_view.cc
@@ -10,6 +10,7 @@
 #include "app/l10n_util.h"
 #include "app/combobox_model.h"
 #include "base/stl_util-inl.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -126,14 +127,15 @@ class DateTimeSection : public SettingsPageSection,
       return static_cast<int>(timezones_.size());
     }
 
-    virtual std::wstring GetItemAt(int index) {
+    virtual string16 GetItemAt(int index) {
       icu::UnicodeString name;
       timezones_[index]->getDisplayName(name);
       std::wstring output;
       UTF16ToWide(name.getBuffer(), name.length(), &output);
       int hour_offset = timezones_[index]->getRawOffset() / 3600000;
-      return StringPrintf(hour_offset == 0 ? L"(GMT) " : (hour_offset > 0 ?
-          L"(GMT+%d) " : L"(GMT%d) "), hour_offset) + output;
+      return WideToUTF16Hack(
+          StringPrintf(hour_offset == 0 ? L"(GMT) " : (hour_offset > 0 ?
+          L"(GMT+%d) " : L"(GMT%d) "), hour_offset) + output);
     }
 
     virtual icu::TimeZone* GetTimeZoneAt(int index) {
diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc
index 5513515..a26f9f4 100644
--- a/chrome/browser/content_setting_combo_model.cc
+++ b/chrome/browser/content_setting_combo_model.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
+#include "base/string16.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/generated_resources.h"
 
@@ -47,20 +48,20 @@ int ContentSettingComboModel::GetItemCount() {
   }
 }
 
-std::wstring ContentSettingComboModel::GetItemAt(int index) {
+string16 ContentSettingComboModel::GetItemAt(int index) {
   switch (SettingForIndex(index)) {
     case CONTENT_SETTING_ALLOW:
-      return l10n_util::GetString(IDS_EXCEPTIONS_ALLOW_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ALLOW_BUTTON);
     case CONTENT_SETTING_BLOCK:
-      return l10n_util::GetString(IDS_EXCEPTIONS_BLOCK_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_BLOCK_BUTTON);
     case CONTENT_SETTING_ASK:
-      return l10n_util::GetString(IDS_EXCEPTIONS_ASK_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ASK_BUTTON);
     case CONTENT_SETTING_SESSION_ONLY:
-      return l10n_util::GetString(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
+      return l10n_util::GetStringUTF16(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON);
     default:
       NOTREACHED();
   }
-  return std::wstring();
+  return string16();
 }
 
 ContentSetting ContentSettingComboModel::SettingForIndex(int index) {
diff --git a/chrome/browser/content_setting_combo_model.h b/chrome/browser/content_setting_combo_model.h
index bb00acd..dac487f 100644
--- a/chrome/browser/content_setting_combo_model.h
+++ b/chrome/browser/content_setting_combo_model.h
@@ -9,6 +9,7 @@
 #include "app/combobox_model.h"
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 #include "chrome/common/content_settings.h"
 
 class ContentSettingComboModel : public ComboboxModel {
@@ -17,8 +18,7 @@ class ContentSettingComboModel : public ComboboxModel {
   virtual ~ContentSettingComboModel();
 
   virtual int GetItemCount();
-
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   ContentSetting SettingForIndex(int index);
 
diff --git a/chrome/browser/default_encoding_combo_model.cc b/chrome/browser/default_encoding_combo_model.cc
index 83477b8..29a819a 100644
--- a/chrome/browser/default_encoding_combo_model.cc
+++ b/chrome/browser/default_encoding_combo_model.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/profile.h"
@@ -23,9 +24,9 @@ DefaultEncodingComboboxModel::DefaultEncodingComboboxModel() {
   l10n_util::SortVectorWithStringKey(locale, &sorted_encoding_list_, true);
 }
 
-std::wstring DefaultEncodingComboboxModel::GetItemAt(int index) {
+string16 DefaultEncodingComboboxModel::GetItemAt(int index) {
   DCHECK(index >= 0 && index < GetItemCount());
-  return sorted_encoding_list_[index].encoding_display_name;
+  return WideToUTF16Hack(sorted_encoding_list_[index].encoding_display_name);
 }
 
 std::string DefaultEncodingComboboxModel::GetEncodingCharsetByIndex(int index) {
diff --git a/chrome/browser/default_encoding_combo_model.h b/chrome/browser/default_encoding_combo_model.h
index 56e3b8d..5283507 100644
--- a/chrome/browser/default_encoding_combo_model.h
+++ b/chrome/browser/default_encoding_combo_model.h
@@ -24,7 +24,7 @@ class DefaultEncodingComboboxModel : public ComboboxModel {
     return static_cast<int>(sorted_encoding_list_.size());
   }
 
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   std::string GetEncodingCharsetByIndex(int index);
 
diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc
index 2e372ac..0593453a 100644
--- a/chrome/browser/gtk/bookmark_bubble_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc
@@ -338,7 +338,7 @@ void BookmarkBubbleGtk::InitFolderComboModel() {
   // the 'Select another folder...' entry that opens the bookmark editor.
   for (int i = 0; i < folder_combo_model_->GetItemCount(); ++i) {
     gtk_combo_box_append_text(GTK_COMBO_BOX(folder_combo_),
-        WideToUTF8(folder_combo_model_->GetItemAt(i)).c_str());
+        UTF16ToUTF8(folder_combo_model_->GetItemAt(i)).c_str());
   }
 
   gtk_combo_box_set_active(GTK_COMBO_BOX(folder_combo_),
diff --git a/chrome/browser/gtk/options/content_exception_editor.cc b/chrome/browser/gtk/options/content_exception_editor.cc
index 10b786a..1c65ea5 100644
--- a/chrome/browser/gtk/options/content_exception_editor.cc
+++ b/chrome/browser/gtk/options/content_exception_editor.cc
@@ -54,7 +54,7 @@ ContentExceptionEditor::ContentExceptionEditor(
   action_combo_ = gtk_combo_box_new_text();
   for (int i = 0; i < cb_model_.GetItemCount(); ++i) {
     gtk_combo_box_append_text(GTK_COMBO_BOX(action_combo_),
-        WideToUTF8(cb_model_.GetItemAt(i)).c_str());
+        UTF16ToUTF8(cb_model_.GetItemAt(i)).c_str());
   }
   gtk_combo_box_set_active(GTK_COMBO_BOX(action_combo_),
                            cb_model_.IndexForSetting(setting_));
diff --git a/chrome/browser/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc
index f9c254a..15ebf9b 100644
--- a/chrome/browser/gtk/options/fonts_page_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_page_gtk.cc
@@ -116,7 +116,7 @@ void FontsPageGtk::InitDefaultEncodingComboBox() {
   for (int i = 0; i < default_encoding_combobox_model_->GetItemCount(); ++i) {
     gtk_combo_box_append_text(
         GTK_COMBO_BOX(default_encoding_combobox_),
-        WideToUTF8(default_encoding_combobox_model_->GetItemAt(i)).c_str());
+        UTF16ToUTF8(default_encoding_combobox_model_->GetItemAt(i)).c_str());
   }
 }
 
diff --git a/chrome/browser/gtk/options/languages_page_gtk.cc b/chrome/browser/gtk/options/languages_page_gtk.cc
index e39972f..2ad3496 100644
--- a/chrome/browser/gtk/options/languages_page_gtk.cc
+++ b/chrome/browser/gtk/options/languages_page_gtk.cc
@@ -32,7 +32,7 @@ GtkWidget* NewComboboxFromModel(ComboboxModel* model) {
   int count = model->GetItemCount();
   for (int i = 0; i < count; ++i)
     gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
-                              WideToUTF8(model->GetItemAt(i)).c_str());
+                              UTF16ToUTF8(model->GetItemAt(i)).c_str());
   return combobox;
 }
 
diff --git a/chrome/browser/language_combobox_model.cc b/chrome/browser/language_combobox_model.cc
index 1745167..e1b610b 100644
--- a/chrome/browser/language_combobox_model.cc
+++ b/chrome/browser/language_combobox_model.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -151,6 +151,14 @@ LanguageComboboxModel::LanguageComboboxModel(
       profile_(profile) {
 }
 
+int LanguageComboboxModel::GetItemCount() {
+  return get_languages_count();
+}
+
+string16 LanguageComboboxModel::GetItemAt(int index) {
+  return WideToUTF16Hack(GetLanguageNameAt(index));
+}
+
 // Returns the index of the language currently specified in the user's
 // preference file.  Note that it's possible for language A to be picked
 // while chrome is currently in language B if the user specified language B
diff --git a/chrome/browser/language_combobox_model.h b/chrome/browser/language_combobox_model.h
index b30aa29..469fa2b 100644
--- a/chrome/browser/language_combobox_model.h
+++ b/chrome/browser/language_combobox_model.h
@@ -12,6 +12,7 @@
 
 #include "app/combobox_model.h"
 #include "base/basictypes.h"
+#include "base/string16.h"
 
 class Profile;
 
@@ -77,9 +78,8 @@ class LanguageComboboxModel : public LanguageList, public ComboboxModel {
 
   virtual ~LanguageComboboxModel() {}
 
-  virtual int GetItemCount() { return get_languages_count(); }
-
-  virtual std::wstring GetItemAt(int index) { return GetLanguageNameAt(index); }
+  virtual int GetItemCount();
+  virtual string16 GetItemAt(int index);
 
   // Returns the index of the language currently specified in the user's
   // preference file.  Note that it's possible for language A to be picked
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index f93c149..56708f0 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -10,6 +10,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -892,7 +893,7 @@ void AutoFillProfilesView::EditableSetViewContents::ItemChanged(
     } else {
       temporary_info_.credit_card.SetInfo(
           AutoFillType(CREDIT_CARD_EXP_MONTH),
-          combo_box_model_month_->GetItemAt(new_index));
+          UTF16ToWideHack(combo_box_model_month_->GetItemAt(new_index)));
     }
   } else if (combo_box == combo_box_year_) {
     if (new_index == -1) {
@@ -900,7 +901,7 @@ void AutoFillProfilesView::EditableSetViewContents::ItemChanged(
     } else {
       temporary_info_.credit_card.SetInfo(
           AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
-          combo_box_model_year_->GetItemAt(new_index));
+          UTF16ToWideHack(combo_box_model_year_->GetItemAt(new_index)));
     }
   } else {
     NOTREACHED();
@@ -1279,16 +1280,16 @@ int AutoFillProfilesView::AddressComboBoxModel::GetItemCount() {
   return static_cast<int>(address_labels_.size()) + shift;
 }
 
-std::wstring AutoFillProfilesView::AddressComboBoxModel::GetItemAt(int index) {
+string16 AutoFillProfilesView::AddressComboBoxModel::GetItemAt(int index) {
   int shift = is_billing_ ? 0 : 1;
   DCHECK(index < (static_cast<int>(address_labels_.size()) + shift));
   if (!is_billing_ && !index)
-    return l10n_util::GetString(IDS_AUTOFILL_DIALOG_SAME_AS_BILLING);
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SAME_AS_BILLING);
   DCHECK(address_labels_.at(index - shift).is_address);
-  std::wstring label =
-      address_labels_.at(index - shift).address.Label();
+  string16 label =
+      WideToUTF16Hack(address_labels_.at(index - shift).address.Label());
   if (label.empty())
-    label = l10n_util::GetString(IDS_AUTOFILL_NEW_ADDRESS);
+    label = l10n_util::GetStringUTF16(IDS_AUTOFILL_NEW_ADDRESS);
   return label;
 }
 
@@ -1301,10 +1302,9 @@ int AutoFillProfilesView::StringVectorComboboxModel::GetItemCount() {
   return cb_strings_.size();
 }
 
-std::wstring AutoFillProfilesView::StringVectorComboboxModel::GetItemAt(
-    int index) {
+string16 AutoFillProfilesView::StringVectorComboboxModel::GetItemAt(int index) {
   DCHECK_GT(static_cast<int>(cb_strings_.size()), index);
-  return cb_strings_[index];
+  return WideToUTF16Hack(cb_strings_[index]);
 }
 
 int AutoFillProfilesView::StringVectorComboboxModel::GetIndex(
diff --git a/chrome/browser/views/autofill_profiles_view_win.h b/chrome/browser/views/autofill_profiles_view_win.h
index 71c5cb8..d11da9e 100644
--- a/chrome/browser/views/autofill_profiles_view_win.h
+++ b/chrome/browser/views/autofill_profiles_view_win.h
@@ -11,6 +11,7 @@
 
 #include "app/combobox_model.h"
 #include "app/table_model.h"
+#include "base/string16.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
@@ -377,7 +378,7 @@ class AutoFillProfilesView : public views::View,
     // Overridden from ComboboxModel:
     // Public as they are used from EditableSetViewContents.
     virtual int GetItemCount();
-    virtual std::wstring GetItemAt(int index);
+    virtual string16 GetItemAt(int index);
 
    private:
     std::list<views::Combobox*> combo_boxes_;
@@ -398,7 +399,7 @@ class AutoFillProfilesView : public views::View,
 
     // Overridden from ComboboxModel:
     virtual int GetItemCount();
-    virtual std::wstring GetItemAt(int index);
+    virtual string16 GetItemAt(int index);
 
     // Find an index of the item in the model, -1 if not present.
     int GetIndex(const std::wstring& value);
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index d30ce35..984bbaf 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -1,10 +1,12 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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/views/clear_browsing_data.h"
 
 #include "app/l10n_util.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/pref_service.h"
@@ -337,15 +339,15 @@ int ClearBrowsingDataView::GetItemCount() {
   return 5;
 }
 
-std::wstring ClearBrowsingDataView::GetItemAt(int index) {
+string16 ClearBrowsingDataView::GetItemAt(int index) {
   switch (index) {
-    case 0: return l10n_util::GetString(IDS_CLEAR_DATA_HOUR);
-    case 1: return l10n_util::GetString(IDS_CLEAR_DATA_DAY);
-    case 2: return l10n_util::GetString(IDS_CLEAR_DATA_WEEK);
-    case 3: return l10n_util::GetString(IDS_CLEAR_DATA_4WEEKS);
-    case 4: return l10n_util::GetString(IDS_CLEAR_DATA_EVERYTHING);
-    default: NOTREACHED() << L"Missing item";
-             return L"?";
+    case 0: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_HOUR);
+    case 1: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DAY);
+    case 2: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_WEEK);
+    case 3: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_4WEEKS);
+    case 4: return l10n_util::GetStringUTF16(IDS_CLEAR_DATA_EVERYTHING);
+    default: NOTREACHED() << "Missing item";
+             return ASCIIToUTF16("?");
   }
 }
 
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index 24670ca..9a3e61a 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -71,7 +71,7 @@ class ClearBrowsingDataView : public views::View,
 
   // Overridden from ComboboxModel:
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // Overridden from views::Combobox::Listener:
   virtual void ItemChanged(views::Combobox* sender, int prev_index,
diff --git a/chrome/browser/views/cookie_info_view.cc b/chrome/browser/views/cookie_info_view.cc
index 4727bd1..f2a1bb1 100644
--- a/chrome/browser/views/cookie_info_view.cc
+++ b/chrome/browser/views/cookie_info_view.cc
@@ -9,7 +9,9 @@
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/profile.h"
 #include "gfx/canvas.h"
@@ -149,8 +151,8 @@ int CookieInfoView::GetItemCount() {
   return static_cast<int>(expire_combo_values_.size());
 }
 
-std::wstring CookieInfoView::GetItemAt(int index) {
-  return expire_combo_values_[index];
+string16 CookieInfoView::GetItemAt(int index) {
+  return WideToUTF16Hack(expire_combo_values_[index]);
 }
 
 void CookieInfoView::AddLabelRow(int layout_id, views::GridLayout* layout,
diff --git a/chrome/browser/views/cookie_info_view.h b/chrome/browser/views/cookie_info_view.h
index 72f4fba..2099a004 100644
--- a/chrome/browser/views/cookie_info_view.h
+++ b/chrome/browser/views/cookie_info_view.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "app/combobox_model.h"
+#include "base/string16.h"
 #include "net/base/cookie_monster.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/view.h"
@@ -73,7 +74,7 @@ class CookieInfoView : public views::View,
 
   // ComboboxModel overrides for expires_value_combobox_.
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
  private:
   // Layout helper routines.
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index 151badf..4ef686f 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/views/importer_view.h"
 
 #include "app/l10n_util.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/importer/importer_data_types.h"
@@ -183,9 +185,9 @@ int ImporterView::GetItemCount() {
   return item_count;
 }
 
-std::wstring ImporterView::GetItemAt(int index) {
+string16 ImporterView::GetItemAt(int index) {
   DCHECK(importer_host_.get());
-  return importer_host_->GetSourceProfileNameAt(index);
+  return WideToUTF16Hack(importer_host_->GetSourceProfileNameAt(index));
 }
 
 void ImporterView::ItemChanged(views::Combobox* combobox,
diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h
index f6ae28f..51044e5 100644
--- a/chrome/browser/views/importer_view.h
+++ b/chrome/browser/views/importer_view.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "app/combobox_model.h"
+#include "base/string16.h"
 #include "chrome/browser/importer/importer.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/combobox/combobox.h"
@@ -56,7 +57,7 @@ class ImporterView : public views::View,
 
   // Overridden from ComboboxModel:
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // Overridden from ChromeViews::Combobox::Listener:
   virtual void ItemChanged(views::Combobox* combobox,
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 1c43f0e..a65e7e8 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -8,6 +8,7 @@
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
@@ -64,7 +65,7 @@ class SearchEngineListModel : public ComboboxModel,
 
   // ComboboxModel overrides:
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
   // Returns the TemplateURL at the specified index.
   const TemplateURL* GetTemplateURLAt(int index);
@@ -121,9 +122,9 @@ int SearchEngineListModel::GetItemCount() {
   return static_cast<int>(template_urls_.size());
 }
 
-std::wstring SearchEngineListModel::GetItemAt(int index) {
+string16 SearchEngineListModel::GetItemAt(int index) {
   DCHECK(index < GetItemCount());
-  return template_urls_[index]->short_name();
+  return WideToUTF16Hack(template_urls_[index]->short_name());
 }
 
 const TemplateURL* SearchEngineListModel::GetTemplateURLAt(int index) {
diff --git a/chrome/browser/views/uninstall_view.cc b/chrome/browser/views/uninstall_view.cc
index 2ecbc43..a7535b0 100644
--- a/chrome/browser/views/uninstall_view.cc
+++ b/chrome/browser/views/uninstall_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,6 +7,8 @@
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ -142,9 +144,9 @@ int UninstallView::GetItemCount() {
   return browsers_->size();
 }
 
-std::wstring UninstallView::GetItemAt(int index) {
+string16 UninstallView::GetItemAt(int index) {
   DCHECK(index < (int) browsers_->size());
   BrowsersMap::const_iterator it = browsers_->begin();
   std::advance(it, index);
-  return (*it).first;
+  return WideToUTF16Hack((*it).first);
 }
diff --git a/chrome/browser/views/uninstall_view.h b/chrome/browser/views/uninstall_view.h
index 0a9147b..30a6268 100644
--- a/chrome/browser/views/uninstall_view.h
+++ b/chrome/browser/views/uninstall_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "app/combobox_model.h"
+#include "base/string16.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/window/dialog_delegate.h"
 
@@ -41,7 +42,7 @@ class UninstallView : public views::View,
 
   // Overridden from views::Combobox::Model.
   virtual int GetItemCount();
-  virtual std::wstring GetItemAt(int index);
+  virtual string16 GetItemAt(int index);
 
  private:
   // Initializes the controls on the dialog.