Remove wstring from TemplateURL and friends....

chrome/browser/gtk/first_run_dialog.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/first_run_dialog.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 323 matching lines @@
         g_object_ref(pixbuf);
       }
 
       GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
       gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
       g_object_unref(pixbuf);
     } else {
       GtkWidget* logo_label = gtk_label_new(NULL);
       char* markup = g_markup_printf_escaped(
           "<span weight='bold' size='x-large' color='black'>%s</span>",
-          WideToUTF8((*search_engine_iter)->short_name()).c_str());
+          UTF16ToUTF8((*search_engine_iter)->short_name()).c_str());
       gtk_label_set_markup(GTK_LABEL(logo_label), markup);
       g_free(markup);
       gtk_widget_set_size_request(logo_label, -1,
           ballot_engines.size() > kNormalBallotSize ? kLogoLabelHeightSmall :
                                                       kLogoLabelHeight);
       gtk_box_pack_start(GTK_BOX(vbox), logo_label, FALSE, FALSE, 0);
     }
 
     // Create the button.
     GtkWidget* button = gtk_button_new_with_label(choose_text.c_str());
@@ skipping 61 matching lines @@
 }
 
 void FirstRunDialog::FirstRunDone() {
   FirstRun::SetShowWelcomePagePref();
 
   if (dialog_)
     gtk_widget_destroy(dialog_);
   MessageLoop::current()->Quit();
   delete this;
 }