Remove wstring from TableModel....

chrome/browser/gtk/options/url_picker_dialog_gtk.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 <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
@@ skipping 190 matching lines @@
   // trailing slash, and unescape most characters, but we need to not drop any
   // username/password, or unescape anything that changes the meaning.
   return UTF16ToUTF8(net::FormatUrl(url_table_model_->GetURL(row),
       languages, net::kFormatUrlOmitAll & ~net::kFormatUrlOmitUsernamePassword,
       UnescapeRule::SPACES, NULL, NULL, NULL));
 }
 
 void UrlPickerDialogGtk::SetColumnValues(int row, GtkTreeIter* iter) {
   SkBitmap bitmap = url_table_model_->GetIcon(row);
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
-  std::wstring title = url_table_model_->GetText(row, IDS_ASI_PAGE_COLUMN);
-  std::wstring url = url_table_model_->GetText(row, IDS_ASI_URL_COLUMN);
+  string16 title = url_table_model_->GetText(row, IDS_ASI_PAGE_COLUMN);
+  string16 url = url_table_model_->GetText(row, IDS_ASI_URL_COLUMN);
   gtk_list_store_set(history_list_store_, iter,
                      COL_FAVICON, pixbuf,
-                     COL_TITLE, WideToUTF8(title).c_str(),
-                     COL_DISPLAY_URL, WideToUTF8(url).c_str(),
+                     COL_TITLE, UTF16ToUTF8(title).c_str(),
+                     COL_DISPLAY_URL, UTF16ToUTF8(url).c_str(),
                      -1);
   g_object_unref(pixbuf);
 }
 
 // static
 gint UrlPickerDialogGtk::CompareTitle(GtkTreeModel* model,
                                       GtkTreeIter* a,
                                       GtkTreeIter* b,
                                       gpointer window) {
   int row1 = gtk_tree::GetRowNumForIter(model, a);
@@ skipping 40 matching lines @@
 
 void UrlPickerDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
   if (response_id == GTK_RESPONSE_OK)
     AddURL();
   gtk_widget_destroy(dialog_);
 }
 
 void UrlPickerDialogGtk::OnWindowDestroy(GtkWidget* widget) {
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }