Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5800)

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 50223002: Prevent modal dialogs when preparing to swap out. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase after RVHM moved Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 686816e1a3334e85a04786456fe0810dc7ccee9f..91f5906a3db02001ebfabc046c6870d0c42ecd70 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -472,13 +472,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CrossProcessNavCancelsDialogs) {
GURL url(test_server()->GetURL("empty.html"));
ui_test_utils::NavigateToURL(browser(), url);
- // TODO(creis): Test this with a setInterval loop of alert dialogs to ensure
- // that we can navigate away even if the renderer tries to synchronously
- // create more. See http://crbug.com/312490.
+ // Test this with a setInterval loop of alert dialogs to ensure that we can
+ // navigate away even if the renderer tries to synchronously create more.
+ // See http://crbug.com/312490.
WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents();
contents->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
string16(),
- ASCIIToUTF16("alert('Dialog showing!');"));
+ ASCIIToUTF16("setInterval(\"alert('Dialog showing!');\", 0);"));
darin (slow to review) 2013/11/01 21:01:42 This feels like such an imprecise test. I wonder i
Charlie Reis 2013/11/04 19:32:49 Good point. I've simplified this to just be two b
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_TRUE(alert->IsValid());
AppModalDialogQueue* dialog_queue = AppModalDialogQueue::GetInstance();

Powered by Google App Engine
This is Rietveld 408576698