Remove wstrings from bookmarks, part 12.

chrome/browser/views/cookie_info_view.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/views/cookie_info_view.h"
 
 #include <algorithm>
 
 #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"
 #include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/border.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/button/native_button.h"
@@ skipping 119 matching lines @@
   if (delegate_)
     delegate_->ModifyExpireDate(new_index != 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, ComboboxModel overrides.
 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,
                                  views::View* label, views::View* value) {
   layout->StartRow(0, layout_id);
   layout->AddView(label);
   layout->AddView(value, 2, 1, views::GridLayout::FILL,
                   views::GridLayout::CENTER);
   layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
 }
@@ skipping 103 matching lines @@
   created_value_field_->SetReadOnly(true);
   created_value_field_->RemoveBorder();
   created_value_field_->SetBackgroundColor(text_area_background);
   if (expires_value_field_) {
     expires_value_field_->SetReadOnly(true);
     expires_value_field_->RemoveBorder();
     expires_value_field_->SetBackgroundColor(text_area_background);
   }
 }