| 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 369ada29f5685567d7c4014aa79c71db179cf51e..1f4da833c88c4e8705a8a5f42dfa15462548d689 100644
|
| --- a/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| @@ -1019,23 +1019,27 @@ 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) {
|
| - 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());
|
| + const std::string NO_BEFORE_UNLOAD_HTML = "<html><body>foo</body></html>";
|
| + NavigateToDataURLAndExpectBeforeUnload(shell(), NO_BEFORE_UNLOAD_HTML, false);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, OnBeforeUnload) {
|
| - 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());
|
| + const std::string BEFORE_UNLOAD_HTML =
|
| + "<html><body><script>window.onbeforeunload=function(e) {}</script>"
|
| + "</body></html>";
|
| + NavigateToDataURLAndExpectBeforeUnload(shell(), BEFORE_UNLOAD_HTML, true);
|
| }
|
|
|
| namespace {
|
|
|
Chromium Code Reviews
Issue 2808953002:
Revert of Followup comments from r460581. (Closed)
