Remove wstring from TableModel....

chrome/browser/ui/views/autofill_profiles_view_win.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/autofill_profiles_view_win.h"
 
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "app/l10n_util.h"
@@ skipping 1248 matching lines @@
 
 void AutoFillProfilesView::ContentListTableModel::UpdateItem(int index) {
   if (observer_)
     observer_->OnItemsChanged(index, 1);
 }
 
 int AutoFillProfilesView::ContentListTableModel::RowCount() {
   return profiles_->size() + credit_cards_->size();
 }
 
-std::wstring AutoFillProfilesView::ContentListTableModel::GetText(
+string16 AutoFillProfilesView::ContentListTableModel::GetText(
     int row, int column_id) {
   DCHECK(row < static_cast<int>(profiles_->size() + credit_cards_->size()));
   if (row < static_cast<int>(profiles_->size())) {
-    return profiles_->at(row).address.Label();
+    return WideToUTF16Hack(profiles_->at(row).address.Label());
   } else {
     row -= profiles_->size();
-    return credit_cards_->at(row).credit_card.PreviewSummary();
+    return WideToUTF16Hack(credit_cards_->at(row).credit_card.PreviewSummary());
   }
 }
 
 TableModel::Groups AutoFillProfilesView::ContentListTableModel::GetGroups() {
   TableModel::Groups groups;
 
   TableModel::Group profile_group;
   profile_group.title = l10n_util::GetString(IDS_AUTOFILL_ADDRESSES_GROUP_NAME);
   profile_group.id = kAddressGroup;
   groups.push_back(profile_group);
@@ skipping 23 matching lines @@
                         AutoFillDialogObserver* observer,
                         Profile* profile) {
   DCHECK(profile);
 
   PersonalDataManager* personal_data_manager =
       profile->GetPersonalDataManager();
   DCHECK(personal_data_manager);
   AutoFillProfilesView::Show(parent, observer, personal_data_manager, profile,
                              profile->GetPrefs(), NULL, NULL);
 }