Remove wstring from TableModel....

chrome/browser/possible_url_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/possible_url_model.h"
 
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
 #include "app/text_elider.h"
 #include "base/callback.h"
@@ skipping 107 matching lines @@
 }
 
 const std::wstring& PossibleURLModel::GetTitle(int row) {
   if (row < 0 || row >= RowCount()) {
     NOTREACHED();
     return EmptyWString();
   }
   return results_[row].title;
 }
 
-std::wstring PossibleURLModel::GetText(int row, int col_id) {
+string16 PossibleURLModel::GetText(int row, int col_id) {
   if (row < 0 || row >= RowCount()) {
     NOTREACHED();
-    return std::wstring();
+    return string16();
   }
 
   if (col_id == IDS_ASI_PAGE_COLUMN) {
-    std::wstring title = GetTitle(row);
+    string16 title = WideToUTF16Hack(GetTitle(row));
     // TODO(xji): Consider adding a special case if the title text is a URL,
     // since those should always have LTR directionality. Please refer to
     // http://crbug.com/6726 for more information.
     base::i18n::AdjustStringForLocaleDirection(&title);
     return title;
   }
 
   // TODO(brettw): this should probably pass the GURL up so the URL elider
   // can be used at a higher level when we know the width.
   string16 url = results_[row].display_url.display_url();
-  return UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality(url));
+  return base::i18n::GetDisplayStringInLTRDirectionality(url);
 }
 
 SkBitmap PossibleURLModel::GetIcon(int row) {
   if (row < 0 || row >= RowCount()) {
     NOTREACHED();
     return *default_fav_icon;
   }
 
   Result& result = results_[row];
   FavIconMap::iterator i = fav_icon_map_.find(result.index);
@@ skipping 44 matching lines @@
       // Notify the observer.
       if (!fav_icon_map_[index].isNull() && observer_)
         observer_->OnItemsChanged(static_cast<int>(index), 1);
     }
   }
 }
 
 void PossibleURLModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }