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

content/shell/browser/shell_javascript_dialog_manager.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_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 35 matching lines @@
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   *did_suppress_message = false;
 
   if (dialog_) {
     // One dialog at a time, please.
     *did_suppress_message = true;
     return;
   }
 
   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();
 
   dialog_.reset(new ShellJavaScriptDialog(this,
                                           parent_window,
                                           javascript_message_type,
                                           new_message_text,
                                           default_prompt_text,
                                           callback));
@@ skipping 23 matching lines @@
 
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   if (dialog_) {
     // Seriously!?
     callback.Run(true, base::string16());
     return;
   }
 
   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();
 
   dialog_.reset(new ShellJavaScriptDialog(this,
                                           parent_window,
                                           JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
                                           new_message_text,
                                           base::string16(),  // default
                                           callback));
@@ skipping 23 matching lines @@
 void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content