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

BUG=330556
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/121033002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242483 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 29 insertions, 27 deletions

diff --git a/content/shell/browser/shell_browser_main.cc b/content/shell/browser/shell_browser_main.cc
index ad2cbda..ca2cd82 100644
--- a/content/shell/browser/shell_browser_main.cc
+++ b/content/shell/browser/shell_browser_main.cc
@@ -99,7 +99,7 @@ bool GetNextTest(const CommandLine::StringVector& args,
   if (args[*position] == FILE_PATH_LITERAL("-"))
     return !!std::getline(std::cin, *test, '\n');
 #if defined(OS_WIN)
-  *test = WideToUTF8(args[(*position)++]);
+  *test = base::WideToUTF8(args[(*position)++]);
 #else
   *test = args[(*position)++];
 #endif
diff --git a/content/shell/browser/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc
index c7aecb2..b583097 100644
--- a/content/shell/browser/shell_devtools_delegate.cc
+++ b/content/shell/browser/shell_devtools_delegate.cc
@@ -107,7 +107,7 @@ Target::Target(WebContents* web_contents) {
   agent_host_ =
       DevToolsAgentHost::GetOrCreateFor(web_contents->GetRenderViewHost());
   id_ = agent_host_->GetId();
-  title_ = UTF16ToUTF8(web_contents->GetTitle());
+  title_ = base::UTF16ToUTF8(web_contents->GetTitle());
   url_ = web_contents->GetURL();
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
diff --git a/content/shell/browser/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc
index bfa93d4..bc0467c 100644
--- a/content/shell/browser/shell_devtools_frontend.cc
+++ b/content/shell/browser/shell_devtools_frontend.cc
@@ -103,7 +103,7 @@ void ShellDevToolsFrontend::RenderViewCreated(
 void ShellDevToolsFrontend::DocumentOnLoadCompletedInMainFrame(int32 page_id) {
   web_contents()->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
       base::string16(),
-      ASCIIToUTF16("InspectorFrontendAPI.setUseSoftMenu(true);"));
+      base::ASCIIToUTF16("InspectorFrontendAPI.setUseSoftMenu(true);"));
 }
 
 void ShellDevToolsFrontend::WebContentsDestroyed(WebContents* web_contents) {
diff --git a/content/shell/browser/shell_gtk.cc b/content/shell/browser/shell_gtk.cc
index 3d2580a..e4242cf 100644
--- a/content/shell/browser/shell_gtk.cc
+++ b/content/shell/browser/shell_gtk.cc
@@ -339,7 +339,7 @@ void Shell::PlatformSetTitle(const base::string16& title) {
   if (headless_)
     return;
 
-  std::string title_utf8 = UTF16ToUTF8(title);
+  std::string title_utf8 = base::UTF16ToUTF8(title);
   gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str());
 }
 
diff --git a/content/shell/browser/shell_javascript_dialog_gtk.cc b/content/shell/browser/shell_javascript_dialog_gtk.cc
index 65bf739..14326ca 100644
--- a/content/shell/browser/shell_javascript_dialog_gtk.cc
+++ b/content/shell/browser/shell_javascript_dialog_gtk.cc
@@ -23,7 +23,7 @@ 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();
 }
 
@@ -70,7 +70,7 @@ ShellJavaScriptDialog::ShellJavaScriptDialog(
                                        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),
@@ -89,7 +89,7 @@ ShellJavaScriptDialog::ShellJavaScriptDialog(
         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);
diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc
index 6ac7243b..7f3b678 100644
--- a/content/shell/browser/shell_javascript_dialog_manager.cc
+++ b/content/shell/browser/shell_javascript_dialog_manager.cc
@@ -53,7 +53,7 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
   }
 
   base::string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
-                              ASCIIToUTF16("\n\n") +
+                              base::ASCIIToUTF16("\n\n") +
                               message_text;
   gfx::NativeWindow parent_window =
       web_contents->GetView()->GetTopLevelNativeWindow();
@@ -97,7 +97,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
 
   base::string16 new_message_text =
       message_text +
-      ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
+      base::ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
 
   gfx::NativeWindow parent_window =
       web_contents->GetView()->GetTopLevelNativeWindow();
diff --git a/content/shell/browser/shell_login_dialog.cc b/content/shell/browser/shell_login_dialog.cc
index b01fe98..b531b65 100644
--- a/content/shell/browser/shell_login_dialog.cc
+++ b/content/shell/browser/shell_login_dialog.cc
@@ -23,8 +23,8 @@ ShellLoginDialog::ShellLoginDialog(
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ShellLoginDialog::PrepDialog, this,
-                 ASCIIToUTF16(auth_info->challenger.ToString()),
-                 UTF8ToUTF16(auth_info->realm)));
+                 base::ASCIIToUTF16(auth_info->challenger.ToString()),
+                 base::UTF8ToUTF16(auth_info->realm)));
 }
 
 void ShellLoginDialog::OnRequestCancelled() {
@@ -77,13 +77,13 @@ void ShellLoginDialog::PrepDialog(const base::string16& host,
   gfx::ElideString(realm, 120, &elided_realm);
 
   base::string16 explanation =
-      ASCIIToUTF16("The server ") + host +
-      ASCIIToUTF16(" requires a username and password.");
+      base::ASCIIToUTF16("The server ") + host +
+      base::ASCIIToUTF16(" requires a username and password.");
 
   if (!elided_realm.empty()) {
-    explanation += ASCIIToUTF16(" The server says: ");
+    explanation += base::ASCIIToUTF16(" The server says: ");
     explanation += elided_realm;
-    explanation += ASCIIToUTF16(".");
+    explanation += base::ASCIIToUTF16(".");
   }
 
   PlatformCreateDialog(explanation);
diff --git a/content/shell/browser/shell_login_dialog_gtk.cc b/content/shell/browser/shell_login_dialog_gtk.cc
index 3241e37..bf24361 100644
--- a/content/shell/browser/shell_login_dialog_gtk.cc
+++ b/content/shell/browser/shell_login_dialog_gtk.cc
@@ -46,7 +46,7 @@ void ShellLoginDialog::PlatformCreateDialog(const base::string16& message) {
                                  "Please log in.");
 
   GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(root_));
-  GtkWidget* label = gtk_label_new(UTF16ToUTF8(message).c_str());
+  GtkWidget* label = gtk_label_new(base::UTF16ToUTF8(message).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_box_pack_start(GTK_BOX(content_area), label, FALSE, FALSE, 0);
 
@@ -94,8 +94,8 @@ void ShellLoginDialog::OnResponse(GtkWidget* sender, int response_id) {
   switch (response_id) {
     case GTK_RESPONSE_OK:
       UserAcceptedAuth(
-          UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(username_entry_))),
-          UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(password_entry_))));
+          base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(username_entry_))),
+          base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(password_entry_))));
       break;
     case GTK_RESPONSE_CANCEL:
     case GTK_RESPONSE_DELETE_EVENT:
diff --git a/content/shell/browser/shell_plugin_service_filter.cc b/content/shell/browser/shell_plugin_service_filter.cc
index 7cabea4..f9cd7b9 100644
--- a/content/shell/browser/shell_plugin_service_filter.cc
+++ b/content/shell/browser/shell_plugin_service_filter.cc
@@ -20,7 +20,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable(
     const GURL& url,
     const GURL& policy_url,
     WebPluginInfo* plugin) {
-  return plugin->name == ASCIIToUTF16("WebKit Test PlugIn");
+  return plugin->name == base::ASCIIToUTF16("WebKit Test PlugIn");
 }
 
 bool ShellPluginServiceFilter::CanLoadPlugin(int render_process_id,
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index c87f198..741c6ba 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -82,7 +82,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
 
   // Update the state of UI controls
   void SetAddressBarURL(const GURL& url) {
-    url_entry_->SetText(ASCIIToUTF16(url.spec()));
+    url_entry_->SetText(base::ASCIIToUTF16(url.spec()));
   }
   void SetWebContents(WebContents* web_contents, const gfx::Size& size) {
     contents_view_->SetLayoutManager(new views::FillLayout());
@@ -145,7 +145,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
       views::ColumnSet* toolbar_column_set =
           toolbar_layout->AddColumnSet(0);
       // Back button
-      back_button_ = new views::LabelButton(this, ASCIIToUTF16("Back"));
+      back_button_ = new views::LabelButton(this, base::ASCIIToUTF16("Back"));
       back_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
       gfx::Size back_button_size = back_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
@@ -154,7 +154,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
                                     back_button_size.width(),
                                     back_button_size.width() / 2);
       // Forward button
-      forward_button_ = new views::LabelButton(this, ASCIIToUTF16("Forward"));
+      forward_button_ =
+          new views::LabelButton(this, base::ASCIIToUTF16("Forward"));
       forward_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
       gfx::Size forward_button_size = forward_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
@@ -163,7 +164,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
                                     forward_button_size.width(),
                                     forward_button_size.width() / 2);
       // Refresh button
-      refresh_button_ = new views::LabelButton(this, ASCIIToUTF16("Refresh"));
+      refresh_button_ =
+          new views::LabelButton(this, base::ASCIIToUTF16("Refresh"));
       refresh_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
       gfx::Size refresh_button_size = refresh_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
@@ -172,7 +174,7 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
                                     refresh_button_size.width(),
                                     refresh_button_size.width() / 2);
       // Stop button
-      stop_button_ = new views::LabelButton(this, ASCIIToUTF16("Stop"));
+      stop_button_ = new views::LabelButton(this, base::ASCIIToUTF16("Stop"));
       stop_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
       gfx::Size stop_button_size = stop_button_->GetPreferredSize();
       toolbar_column_set->AddColumn(views::GridLayout::CENTER,
@@ -216,11 +218,11 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE {
    if (sender == url_entry_ && key_event.key_code() == ui::VKEY_RETURN) {
-     std::string text = UTF16ToUTF8(url_entry_->text());
+     std::string text = base::UTF16ToUTF8(url_entry_->text());
      GURL url(text);
      if (!url.has_scheme()) {
        url = GURL(std::string("http://") + std::string(text));
-       url_entry_->SetText(ASCIIToUTF16(url.spec()));
+       url_entry_->SetText(base::ASCIIToUTF16(url.spec()));
      }
      shell_->LoadURL(url);
      return true;
diff --git a/content/shell/browser/shell_win.cc b/content/shell/browser/shell_win.cc
index b9e57a9..3e253ff 100644
--- a/content/shell/browser/shell_win.cc
+++ b/content/shell/browser/shell_win.cc
@@ -76,7 +76,7 @@ void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
 }
 
 void Shell::PlatformSetAddressBarURL(const GURL& url) {
-  std::wstring url_string = UTF8ToWide(url.spec());
+  std::wstring url_string = base::UTF8ToWide(url.spec());
   SendMessage(url_edit_view_, WM_SETTEXT, 0,
               reinterpret_cast<LPARAM>(url_string.c_str()));
 }