Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/ui/gtk/options/general_page_gtk.cc

 // Copyright (c) 2011 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 668 matching lines @@
   for (size_t i = 0; i < model_urls.size(); ++i) {
     if (!model_urls[i]->ShowInDefaultList())
       continue;
     populated = true;
     GtkTreeIter iter;
     gtk_list_store_append(default_search_engines_model_, &iter);
     gtk_list_store_set(
         default_search_engines_model_, &iter,
         SEARCH_ENGINES_COL_INDEX, i,
         SEARCH_ENGINES_COL_TITLE,
-        UTF16ToUTF8(model_urls[i]->short_name()).c_str(),
+        WideToUTF8(model_urls[i]->short_name()).c_str(),
         -1);
     if (model_urls[i] == default_search_provider) {
       gtk_combo_box_set_active_iter(
           GTK_COMBO_BOX(default_search_engine_combobox_), &iter);
     }
   }
   EnableDefaultSearchEngineComboBox(populated &&
       !template_url_model_->is_default_search_managed());
   default_search_initializing_ = false;
 }
@@ skipping 96 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());
 }