Stop using nested message loop for alert() and other JS dialogs

chrome/browser/extensions/content_script_apitest.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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 464 matching lines @@
   // Navigate! Both extensions will try to inject.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       embedded_test_server()->GetURL("/empty.html"),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 
   run_loop.Run();
   // Right now, the alert dialog is showing and blocking injection of anything
   // after it, so the listener shouldn't be satisfied.
-  EXPECT_TRUE(RunAllPending(web_contents));
   EXPECT_FALSE(listener.was_satisfied());
   EXPECT_EQ(1u, dialog_helper.dialog_count());
   dialog_helper.CloseDialogs();
 
   // After closing the dialog, the rest of the scripts should be able to
   // inject.
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 }
 
 // Test that closing a tab with a blocking script results in no further scripts
@@ skipping 35 matching lines @@
   // Navitate!
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       embedded_test_server()->GetURL("/empty.html"),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 
   // Now, instead of closing the dialog, just close the tab. Later scripts
   // should never get a chance to run (and we shouldn't crash).
   run_loop.Run();
-  EXPECT_TRUE(RunAllPending(web_contents));
   EXPECT_FALSE(listener.was_satisfied());
   EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt(
       browser()->tab_strip_model()->active_index(), 0));
   EXPECT_FALSE(listener.was_satisfied());
 }
 
 // There was a bug by which content scripts that blocked and ran on
 // document_idle could be injected twice (crbug.com/431263). Test for
 // regression.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
@@ skipping 17 matching lines @@
   // Navigate!
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       embedded_test_server()->GetURL("/empty.html"),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 
   run_loop.Run();
 
   // The extension will have injected at idle, but it should only inject once.
-  EXPECT_TRUE(RunAllPending(web_contents));
   EXPECT_EQ(1u, dialog_helper.dialog_count());
   dialog_helper.CloseDialogs();
   EXPECT_TRUE(RunAllPending(web_contents));
   EXPECT_EQ(1u, dialog_helper.dialog_count());
 }
 
 // Bug fix for crbug.com/507461.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
                        DocumentStartInjectionFromExtensionTabNavigation) {
   ASSERT_TRUE(StartEmbeddedTestServer());
@@ skipping 42 matching lines @@
   ExtensionTestMessageListener iframe_loaded_listener("iframe loaded", false);
   ExtensionTestMessageListener content_script_listener("script injected",
                                                        false);
   LoadExtension(data_dir.AppendASCII("script_a_com"));
   LoadExtension(data_dir.AppendASCII("background_page_iframe"));
   iframe_loaded_listener.WaitUntilSatisfied();
   EXPECT_FALSE(content_script_listener.was_satisfied());
 }
 
 }  // namespace extensions