| 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 69e837e611b00c414663850c882696b9cce4c14e..1bafdfab483389fd3abec6ba23a7d67882a7da67 100644
|
| --- a/content/test/test_render_frame_host.cc
|
| +++ b/content/test/test_render_frame_host.cc
|
| @@ -10,6 +10,7 @@
|
| #include "content/browser/frame_host/navigator.h"
|
| #include "content/browser/frame_host/navigator_impl.h"
|
| #include "content/browser/frame_host/render_frame_host_delegate.h"
|
| +#include "content/common/frame_messages.h"
|
| #include "content/public/browser/stream_handle.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/test/browser_side_navigation_test_utils.h"
|
| @@ -185,7 +186,7 @@ void TestRenderFrameHost::SendNavigateWithParameters(
|
| }
|
|
|
| void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url) {
|
| - FrameHostMsg_BeginNavigation_Params begin_params;
|
| + BeginNavigationParams begin_params;
|
| CommonNavigationParams common_params;
|
| begin_params.method = "GET";
|
| begin_params.load_flags = net::LOAD_NORMAL;
|
| @@ -193,7 +194,8 @@ void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url) {
|
| common_params.url = url;
|
| common_params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault);
|
| common_params.transition = ui::PAGE_TRANSITION_LINK;
|
| - OnBeginNavigation(begin_params, common_params);
|
| + OnBeginNavigation(common_params, begin_params,
|
| + scoped_refptr<ResourceRequestBody>());
|
| }
|
|
|
| void TestRenderFrameHost::DidDisownOpener() {
|
| @@ -224,7 +226,7 @@ void TestRenderFrameHost::PrepareForCommit(const GURL& url) {
|
| // We may not have simulated the renderer response to the navigation request.
|
| // Do that now.
|
| if (request->state() == NavigationRequest::WAITING_FOR_RENDERER_RESPONSE)
|
| - SendBeginNavigationWithURL(url);
|
| + SendBeforeUnloadACK(true);
|
|
|
| // We have already simulated the IO thread commit. Only the
|
| // DidCommitProvisionalLoad from the renderer is missing.
|
|
|