Remove JS dialog dependency from content.

chrome/browser/ui/gtk/js_modal_dialog_gtk.cc

Index: chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
diff --git a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
index dbad86647c20940c7d60f2363c24f00f0e1678cc..bb1a71b933c37499ccf07d6626c22de902032ee1 100644
--- a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
@@ -24,12 +24,12 @@ const char kSuppressCheckboxId[] = "chrome_suppress_checkbox";
 
 // If there's a text entry in the dialog, get the text from the first one and
 // return it.
-std::wstring GetPromptText(GtkDialog* dialog) {
+string16 GetPromptText(GtkDialog* dialog) {
   GtkWidget* widget = static_cast<GtkWidget*>(
       g_object_get_data(G_OBJECT(dialog), kPromptTextId));
   if (widget)
-    return UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(widget)));
-  return std::wstring();
+    return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(widget)));
+  return string16();
 }
 
 // If there's a toggle button in the dialog, return the toggled state.
@@ -87,12 +87,12 @@ JSModalDialogGtk::JSModalDialogGtk(JavaScriptAppModalDialog* dialog,
 
   gtk_dialog_ = gtk_message_dialog_new(parent_window,
       GTK_DIALOG_MODAL, message_type, buttons, "%s",
-      WideToUTF8(dialog_->message_text()).c_str());
+      UTF16ToUTF8(dialog_->message_text()).c_str());
   g_signal_connect(gtk_dialog_, "delete-event",
                    G_CALLBACK(gtk_widget_hide_on_delete), NULL);
   gtk_util::ApplyMessageDialogQuirks(gtk_dialog_);
   gtk_window_set_title(GTK_WINDOW(gtk_dialog_),
-                       WideToUTF8(dialog_->title()).c_str());
+                       UTF16ToUTF8(dialog_->title()).c_str());
 
   // Adjust content area as needed.  Set up the prompt text entry or
   // suppression check box.
@@ -101,7 +101,7 @@ JSModalDialogGtk::JSModalDialogGtk(JavaScriptAppModalDialog* dialog,
     GtkWidget* contents_vbox = GTK_DIALOG(gtk_dialog_)->vbox;
     GtkWidget* text_box = gtk_entry_new();
     gtk_entry_set_text(GTK_ENTRY(text_box),
-        WideToUTF8(dialog_->default_prompt_text()).c_str());
+        UTF16ToUTF8(dialog_->default_prompt_text()).c_str());
     gtk_box_pack_start(GTK_BOX(contents_vbox), text_box, TRUE, TRUE, 0);
     g_object_set_data(G_OBJECT(gtk_dialog_), kPromptTextId, text_box);
     gtk_entry_set_activates_default(GTK_ENTRY(text_box), TRUE);