Remove wstrings from bookmarks, part 12.

chrome/browser/content_setting_combo_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/content_setting_combo_model.h"
 
 #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"
 
 namespace {
 
 // The settings shown in the combobox if show_session_ is false;
 const ContentSetting kNoSessionSettings[] = { CONTENT_SETTING_ALLOW,
                                               CONTENT_SETTING_BLOCK };
 
 // The settings shown in the combobox if show_session_ is true;
@@ skipping 21 matching lines @@
 
 int ContentSettingComboModel::GetItemCount() {
   if (show_session_) {
     return disable_cookie_prompt_ ?
         arraysize(kSessionSettings) : arraysize(kSessionAskSettings);
   } else {
     return arraysize(kNoSessionSettings);
   }
 }
 
-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) {
   if (show_session_) {
     return disable_cookie_prompt_ ?
         kSessionSettings[index] : kSessionAskSettings[index];
   } else {
     return kNoSessionSettings[index];
   }
 }
 
 int ContentSettingComboModel::IndexForSetting(ContentSetting setting) {
   for (int i = 0; i < GetItemCount(); ++i)
     if (SettingForIndex(i) == setting)
       return i;
   NOTREACHED();
   return 0;
 }