Convert string16 to base::string16 in content.

content/shell/browser/shell_javascript_dialog_manager.cc

Index: content/shell/browser/shell_javascript_dialog_manager.cc
diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc
index 1476f7c2475745b7f619499f2e6e9c564f588bf4..6ac7243bfb5b8ba71aa2b1b18b4df1063f05c1f0 100644
--- a/content/shell/browser/shell_javascript_dialog_manager.cc
+++ b/content/shell/browser/shell_javascript_dialog_manager.cc
@@ -27,18 +27,18 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
     const GURL& origin_url,
     const std::string& accept_lang,
     JavaScriptMessageType javascript_message_type,
-    const string16& message_text,
-    const string16& default_prompt_text,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    callback.Run(true, string16());
+    callback.Run(true, base::string16());
     return;
   }
 
   if (!dialog_request_callback_.is_null()) {
     dialog_request_callback_.Run();
-    callback.Run(true, string16());
+    callback.Run(true, base::string16());
     dialog_request_callback_.Reset();
     return;
   }
@@ -52,7 +52,7 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
     return;
   }
 
-  string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
+  base::string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
                               ASCIIToUTF16("\n\n") +
                               message_text;
   gfx::NativeWindow parent_window =
@@ -73,17 +73,17 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
 
 void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
     WebContents* web_contents,
-    const string16& message_text,
+    const base::string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    callback.Run(true, string16());
+    callback.Run(true, base::string16());
     return;
   }
 
   if (!dialog_request_callback_.is_null()) {
     dialog_request_callback_.Run();
-    callback.Run(true, string16());
+    callback.Run(true, base::string16());
     dialog_request_callback_.Reset();
     return;
   }
@@ -91,11 +91,11 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   if (dialog_) {
     // Seriously!?
-    callback.Run(true, string16());
+    callback.Run(true, base::string16());
     return;
   }
 
-  string16 new_message_text =
+  base::string16 new_message_text =
       message_text +
       ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
 
@@ -106,11 +106,11 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
                                           parent_window,
                                           JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
                                           new_message_text,
-                                          string16(),  // default_prompt_text
+                                          base::string16(),  // default
                                           callback));
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
-  callback.Run(true, string16());
+  callback.Run(true, base::string16());
   return;
 #endif
 }