Move plugin_browsertests.cc from browser_tests to content_browsertests.

content/shell/shell_javascript_dialog_creator.cc

 // Copyright (c) 2012 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/shell_javascript_dialog_creator.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 26 matching lines @@
       printf("CONFIRM: %s\n", UTF16ToUTF8(message_text).c_str());
     } else {  // JAVASCRIPT_MESSAGE_TYPE_PROMPT
       printf("PROMPT: %s, default text: %s\n",
              UTF16ToUTF8(message_text).c_str(),
              UTF16ToUTF8(default_prompt_text).c_str());
     }
     callback.Run(true, string16());
     return;
   }
 
+  if (!dialog_request_callback_.is_null()) {
+    dialog_request_callback_.Run();
+    callback.Run(true, string16());
+    dialog_request_callback_.Reset();
+    return;
+  }
+
 #if defined(OS_MACOSX) || defined(OS_WIN)
   *did_suppress_message = false;
 
   if (dialog_.get()) {
     // One dialog at a time, please.
     *did_suppress_message = true;
     return;
   }
 
   string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
@@ skipping 21 matching lines @@
     printf("CONFIRM NAVIGATION: %s\n", UTF16ToUTF8(message_text).c_str());
     LayoutTestControllerHost* controller =
         LayoutTestControllerHost::FromRenderViewHost(
             web_contents->GetRenderViewHost());
     callback.Run(
         !controller->should_stay_on_page_after_handling_before_unload(),
         string16());
     return;
   }
 
+  if (!dialog_request_callback_.is_null()) {
+    dialog_request_callback_.Run();
+    callback.Run(true, string16());
+    dialog_request_callback_.Reset();
+    return;
+  }
+
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (dialog_.get()) {
     // Seriously!?
     callback.Run(true, string16());
     return;
   }
 
   string16 new_message_text =
       message_text +
       ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
@@ skipping 25 matching lines @@
 void ShellJavaScriptDialogCreator::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #endif
 }
 
 }  // namespace content