Chromium Code Reviews| Index: content/test/test_render_frame_host.cc |
| diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc |
| index 93bc602599602e5a8ce517628c914dc2b1c966c9..c0c2d907ffc3913d2da2f2faa48ab68e4b405dcd 100644 |
| --- a/content/test/test_render_frame_host.cc |
| +++ b/content/test/test_render_frame_host.cc |
| @@ -200,6 +200,13 @@ void TestRenderFrameHost::SendNavigateWithParameters( |
| OnDidCommitProvisionalLoad(msg); |
| } |
| +void TestRenderFrameHost::NavigateAndCommitRendererInitiated(int page_id, |
| + const GURL& url) { |
| + SendRendererInitiatedNavigationRequest(url, false); |
| + PrepareForCommit(); |
| + SendNavigate(page_id, url); |
| +} |
| + |
| void TestRenderFrameHost::SendRendererInitiatedNavigationRequest( |
| const GURL& url, |
| bool has_user_gesture) { |
| @@ -229,7 +236,8 @@ void TestRenderFrameHost::PrepareForCommitWithServerRedirect( |
| if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kEnableBrowserSideNavigation)) { |
| // Non PlzNavigate |
| - SendBeforeUnloadACK(true); |
| + if (IsWaitingForBeforeUnloadACK()) |
|
clamy
2015/04/02 12:52:35
This is necessary if PrepareForCommit is called on
|
| + SendBeforeUnloadACK(true); |
| return; |
| } |