Remove wstring from TableModel....

chrome/browser/gtk/options/general_page_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 "chrome/browser/gtk/options/general_page_gtk.h"
 
 #include <set>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 581 matching lines @@
   }
 
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(profile()->GetPrefs(), pref);
 }
 
 void GeneralPageGtk::SetColumnValues(int row, GtkTreeIter* iter) {
   SkBitmap bitmap = startup_custom_pages_table_model_->GetIcon(row);
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
-  std::wstring text = startup_custom_pages_table_model_->GetText(row, 0);
+  string16 text = startup_custom_pages_table_model_->GetText(row, 0);
   std::string tooltip =
-      WideToUTF8(startup_custom_pages_table_model_->GetTooltip(row));
+      UTF16ToUTF8(startup_custom_pages_table_model_->GetTooltip(row));
   gchar* escaped_tooltip = g_markup_escape_text(tooltip.c_str(),
                                                 tooltip.size());
   gtk_list_store_set(startup_custom_pages_store_, iter,
                      COL_FAVICON, pixbuf,
-                     COL_URL, WideToUTF8(text).c_str(),
+                     COL_URL, UTF16ToUTF8(text).c_str(),
                      COL_TOOLTIP, escaped_tooltip,
                      -1);
   g_object_unref(pixbuf);
   g_free(escaped_tooltip);
 }
 
 void GeneralPageGtk::SetCustomUrlListFromCurrentPages() {
   startup_custom_pages_table_model_->SetToCurrentlyOpenPages();
 
   SaveStartupPref();
@@ skipping 177 matching lines @@
   int desired_width = allocation->x - sender->parent->allocation.x;
   GtkRequisition req;
   gtk_widget_size_request(instant_indent_, &req);
   if (req.width != desired_width)
     gtk_widget_set_size_request(instant_indent_, desired_width, -1);
 }
 
 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) {
   browser::ShowOptionsURL(profile(), browser::InstantLearnMoreURL());
 }