Remove wstring from TableModel....

chrome/browser/custom_home_pages_table_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/custom_home_pages_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
 #include "base/i18n/rtl.h"
@@ skipping 12 matching lines @@
 #include "net/base/net_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 struct CustomHomePagesTableModel::Entry {
   Entry() : title_handle(0), fav_icon_handle(0) {}
 
   // URL of the page.
   GURL url;
 
   // Page title.  If this is empty, we'll display the URL as the entry.
-  std::wstring title;
+  string16 title;
 
   // Icon for the page.
   SkBitmap icon;
 
   // If non-zero, indicates we're loading the title for the page.
   HistoryService::Handle title_handle;
 
   // If non-zero, indicates we're loading the favicon for the page.
   FaviconService::Handle fav_icon_handle;
 };
@@ skipping 79 matching lines @@
   std::vector<GURL> urls(entries_.size());
   for (size_t i = 0; i < entries_.size(); ++i)
     urls[i] = entries_[i].url;
   return urls;
 }
 
 int CustomHomePagesTableModel::RowCount() {
   return static_cast<int>(entries_.size());
 }
 
-std::wstring CustomHomePagesTableModel::GetText(int row, int column_id) {
+string16 CustomHomePagesTableModel::GetText(int row, int column_id) {
   DCHECK(column_id == 0);
   DCHECK(row >= 0 && row < RowCount());
   return entries_[row].title.empty() ? FormattedURL(row) : entries_[row].title;
 }
 
 SkBitmap CustomHomePagesTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
   return entries_[row].icon.isNull() ? *default_favicon_ : entries_[row].icon;
 }
 
-std::wstring CustomHomePagesTableModel::GetTooltip(int row) {
-  return entries_[row].title.empty() ? std::wstring() : UTF16ToWideHack(
+string16 CustomHomePagesTableModel::GetTooltip(int row) {
+  return entries_[row].title.empty() ? string16() :
       l10n_util::GetStringFUTF16(IDS_OPTIONS_STARTUP_PAGE_TOOLTIP,
-                                 WideToUTF16Hack(entries_[row].title),
-                                 WideToUTF16Hack(FormattedURL(row))));
+                                 entries_[row].title, FormattedURL(row));
 }
 
 void CustomHomePagesTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 void CustomHomePagesTableModel::LoadTitleAndFavIcon(Entry* entry) {
   HistoryService* history_service =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (history_service) {
@@ skipping 16 matching lines @@
                                            history::VisitVector* visits) {
   int entry_index;
   Entry* entry =
       GetEntryByLoadHandle(&Entry::title_handle, handle, &entry_index);
   if (!entry) {
     // The URLs changed before we were called back.
     return;
   }
   entry->title_handle = 0;
   if (found_url && !row->title().empty()) {
-    entry->title = UTF16ToWide(row->title());
+    entry->title = row->title();
     if (observer_)
       observer_->OnItemsChanged(static_cast<int>(entry_index), 1);
   }
 }
 
 void CustomHomePagesTableModel::OnGotFavIcon(
     FaviconService::Handle handle,
     bool know_fav_icon,
     scoped_refptr<RefCountedMemory> image_data,
     bool is_expired,
@@ skipping 30 matching lines @@
     int* index) {
   for (size_t i = 0; i < entries_.size(); ++i) {
     if (entries_[i].*member == handle) {
       *index = static_cast<int>(i);
       return &entries_[i];
     }
   }
   return NULL;
 }
 
-std::wstring CustomHomePagesTableModel::FormattedURL(int row) const {
+string16 CustomHomePagesTableModel::FormattedURL(int row) const {
   std::string languages =
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
   string16 url = net::FormatUrl(entries_[row].url, languages);
   url = base::i18n::GetDisplayStringInLTRDirectionality(url);
-  return UTF16ToWide(url);
+  return url;
 }