Update uses of UTF conversions in content/ to use the base:: namespace.

content/shell/browser/shell_javascript_dialog_gtk.cc

 // Copyright 2013 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 "content/shell/browser/shell_javascript_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/shell/app/resource.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 
 namespace {
 
 const char kPromptTextId[] = "content_shell_prompt_text";
 
 // If there's a text entry in the dialog, get the text from the first one and
 // return it.
 base::string16 GetPromptText(GtkDialog* dialog) {
   GtkWidget* widget = static_cast<GtkWidget*>(
       g_object_get_data(G_OBJECT(dialog), kPromptTextId));
   if (widget)
-    return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(widget)));
+    return base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(widget)));
   return base::string16();
 }
 
 }  // namespace
 
 
 namespace content {
 
 ShellJavaScriptDialog::ShellJavaScriptDialog(
     ShellJavaScriptDialogManager* manager,
@@ skipping 26 matching lines @@
 
     default:
       NOTREACHED();
   }
 
   gtk_dialog_ = gtk_message_dialog_new(parent_window_,
                                        GTK_DIALOG_MODAL,
                                        gtk_message_type,
                                        buttons,
                                        "%s",
-                                       UTF16ToUTF8(message_text).c_str());
+                                       base::UTF16ToUTF8(message_text).c_str());
   g_signal_connect(gtk_dialog_,
                    "delete-event",
                    G_CALLBACK(gtk_widget_hide_on_delete),
                    NULL);
   gtk_window_set_title(GTK_WINDOW(gtk_dialog_), "JavaScript");
 
   GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(gtk_dialog_),
                                                GTK_STOCK_OK,
                                                GTK_RESPONSE_OK);
 
   if (message_type != content::JAVASCRIPT_MESSAGE_TYPE_PROMPT)
     gtk_widget_grab_focus(ok_button);
 
   if (message_type == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
     GtkWidget* content_area =
         gtk_dialog_get_content_area(GTK_DIALOG(gtk_dialog_));
     GtkWidget* text_box = gtk_entry_new();
     gtk_entry_set_text(GTK_ENTRY(text_box),
-                       UTF16ToUTF8(default_prompt_text).c_str());
+                       base::UTF16ToUTF8(default_prompt_text).c_str());
     gtk_box_pack_start(GTK_BOX(content_area), 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);
   }
 
   gtk_dialog_set_default_response(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_OK);
   g_signal_connect(gtk_dialog_, "response", G_CALLBACK(OnResponseThunk), this);
   gtk_widget_show_all(GTK_WIDGET(gtk_dialog_));
 }
 
@@ skipping 15 matching lines @@
     default:
       NOTREACHED();
   }
 
   gtk_widget_destroy(dialog);
 
   manager_->DialogClosed(this);
 }
 
 }  // namespace content