content/browser/web_contents/web_contents_impl_browsertest.cc - Issue 2781383002: Followup comments from r460581.

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: content/browser/web_contents/web_contents_impl_browsertest.cc

Issue 2781383002: Followup comments from r460581. (Closed)

Patch Set: Created 3 years, 9 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 | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/frame_messages.h » ('j') | third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl_browsertest.cc

diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc

index 924873625295deb322cde30e702c5bd3ffef35a5..a1b0f2c33e901a26e9d4fdb32681589a06e2b7f2 100644

--- a/content/browser/web_contents/web_contents_impl_browsertest.cc

+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc

@@ -1019,27 +1019,23 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,

EXPECT_TRUE(shell()->web_contents()->IsLoading());

}

-namespace {

-void NavigateToDataURLAndExpectBeforeUnload(Shell* shell,

- const std::string& html,

- bool expect_onbeforeunload) {

- NavigateToURL(shell, GURL("data:text/html," + html));

- RenderFrameHostImpl* rfh =

- static_cast<RenderFrameHostImpl*>(shell->web_contents()->GetMainFrame());

- EXPECT_EQ(expect_onbeforeunload, rfh->ShouldDispatchBeforeUnload());

-} // namespace

IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, NoOnBeforeUnload) {

- const std::string NO_BEFORE_UNLOAD_HTML = "<html><body>foo</body></html>";

- NavigateToDataURLAndExpectBeforeUnload(shell(), NO_BEFORE_UNLOAD_HTML, false);

+ ASSERT_TRUE(embedded_test_server()->Start());

+ GURL url = embedded_test_server()->GetURL("/simple_page.html");

+ NavigateToURL(shell(), url);

+ RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(

+ shell()->web_contents()->GetMainFrame());

+ EXPECT_FALSE(rfh->ShouldDispatchBeforeUnload());

}

IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, OnBeforeUnload) {

- const std::string BEFORE_UNLOAD_HTML =

- "<html><body><script>window.onbeforeunload=function(e) {}</script>"

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

- NavigateToDataURLAndExpectBeforeUnload(shell(), BEFORE_UNLOAD_HTML, true);

+ ASSERT_TRUE(embedded_test_server()->Start());

+ GURL url =

+ embedded_test_server()->GetURL("/page_with_empty_beforeunload.html");

+ NavigateToURL(shell(), url);

+ RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(

+ shell()->web_contents()->GetMainFrame());

+ EXPECT_TRUE(rfh->ShouldDispatchBeforeUnload());

}

namespace {