chrome/browser/unload_browsertest.cc - Issue 1931793002: Stop using nested message loop for alert() and other JS dialogs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/unload_browsertest.cc

Issue 1931793002: Stop using nested message loop for alert() and other JS dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updated comments and removed unused declaration Created 4 years, 7 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

« no previous file with comments | « chrome/browser/ui/unload_controller.cc ('k') | content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/unload_browsertest.cc

diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc

index 4e0d2b121d0b12ff54aad6bc70f8729c88814bbd..7806bdcd843d0edc7131012ff1620278fab98a92 100644

--- a/chrome/browser/unload_browsertest.cc

+++ b/chrome/browser/unload_browsertest.cc

@@ -59,14 +59,6 @@ const std::string INNER_FRAME_WITH_FOCUS_HTML =

"<body><input id='box'></input></body></html>\"></iframe>"

"</body></html>";

-const std::string TWO_SECOND_BEFORE_UNLOAD_HTML =

- "<html><head><title>twosecondbeforeunload</title></head><body>"

- "<script>window.onbeforeunload=function(e){"

- "var start = new Date().getTime();"

- "while(new Date().getTime() - start < 2000){}"

- "return 'foo';"

- "}</script></body></html>";

const std::string INFINITE_UNLOAD_HTML =

"<html><head><title>infiniteunload</title></head><body>"

"<script>window.onunload=function(e){while(true){}}</script>"

@@ -323,11 +315,11 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseWithInnerFocusedFrame) {

window_observer.Wait();

}

-// Tests closing the browser with a beforeunload handler that takes

-// two seconds to run.

-IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) {

- LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_HTML,

- "twosecondbeforeunload");

+// Tests closing the browser with a beforeunload handler that takes forever

+// by running an infinite loop.

+IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteBeforeUnload) {

+ LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_HTML,

+ "infinitebeforeunload");

}

// Tests closing the browser on a page with an unload listener registered where