Remove wstrings from bookmarks, part 12.

chrome/browser/content_setting_combo_model.cc

Index: chrome/browser/content_setting_combo_model.cc
diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc
index 5513515c47b95fe9149080f2517f04243452dad5..a26f9f4884f4ad79457dc6993ff9f63f8af6c5fd 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) {