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

chrome/browser/ui/gtk/edit_search_engine_dialog.cc

Index: chrome/browser/ui/gtk/edit_search_engine_dialog.cc
===================================================================
--- chrome/browser/ui/gtk/edit_search_engine_dialog.cc	(revision 71499)
+++ chrome/browser/ui/gtk/edit_search_engine_dialog.cc	(working copy)
@@ -26,7 +26,7 @@
 namespace {
 
 std::string GetDisplayURL(const TemplateURL& turl) {
-  return turl.url() ? UTF16ToUTF8(turl.url()->DisplayURL()) : std::string();
+  return turl.url() ? WideToUTF8(turl.url()->DisplayURL()) : std::string();
 }
 
 // Forces text to lowercase when connected to an editable's "insert-text"
@@ -158,10 +158,10 @@
   if (controller_->template_url()) {
     gtk_entry_set_text(
         GTK_ENTRY(title_entry_),
-        UTF16ToUTF8(controller_->template_url()->short_name()).c_str());
+        WideToUTF8(controller_->template_url()->short_name()).c_str());
     gtk_entry_set_text(
         GTK_ENTRY(keyword_entry_),
-        UTF16ToUTF8(controller_->template_url()->keyword()).c_str());
+        WideToUTF8(controller_->template_url()->keyword()).c_str());
     gtk_entry_set_text(
         GTK_ENTRY(url_entry_),
         GetDisplayURL(*controller_->template_url()).c_str());