| 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 1a11e5a7071f3cf2ffbb9fa7b2c9395ff69a75dd..4d7efdfb471f44bff4cf4b83ba83ae695d925f88 100644
|
| --- a/content/test/test_render_frame_host.cc
|
| +++ b/content/test/test_render_frame_host.cc
|
| @@ -110,7 +110,7 @@ void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) {
|
| }
|
|
|
| OnDidStartLoading(true);
|
| - OnDidStartProvisionalLoad(url, base::TimeTicks::Now(), NavigationGestureUser);
|
| + OnDidStartProvisionalLoad(url, base::TimeTicks::Now());
|
| SimulateWillStartRequest(ui::PAGE_TRANSITION_LINK);
|
| }
|
|
|
| @@ -199,8 +199,7 @@ void TestRenderFrameHost::SimulateNavigationError(const GURL& url,
|
| void TestRenderFrameHost::SimulateNavigationErrorPageCommit() {
|
| CHECK(navigation_handle());
|
| GURL error_url = GURL(kUnreachableWebDataURL);
|
| - OnDidStartProvisionalLoad(error_url, base::TimeTicks::Now(),
|
| - NavigationGestureUser);
|
| + OnDidStartProvisionalLoad(error_url, base::TimeTicks::Now());
|
| FrameHostMsg_DidCommitProvisionalLoad_Params params;
|
| params.nav_entry_id = 0;
|
| params.did_create_new_entry = true;
|
| @@ -308,8 +307,7 @@ void TestRenderFrameHost::SendNavigateWithParameters(
|
| // DidStartProvisionalLoad may delete the pending entry that holds |url|,
|
| // so we keep a copy of it to use below.
|
| GURL url_copy(url);
|
| - OnDidStartProvisionalLoad(url_copy, base::TimeTicks::Now(),
|
| - NavigationGestureUser);
|
| + OnDidStartProvisionalLoad(url_copy, base::TimeTicks::Now());
|
| SimulateWillStartRequest(transition);
|
|
|
| FrameHostMsg_DidCommitProvisionalLoad_Params params;
|
| @@ -398,14 +396,13 @@ void TestRenderFrameHost::SendRendererInitiatedNavigationRequest(
|
| InitializeRenderFrameIfNeeded();
|
|
|
| if (IsBrowserSideNavigationEnabled()) {
|
| - BeginNavigationParams begin_params(std::string(), net::LOAD_NORMAL, false,
|
| + BeginNavigationParams begin_params(std::string(), net::LOAD_NORMAL,
|
| + has_user_gesture, false,
|
| REQUEST_CONTEXT_TYPE_HYPERLINK);
|
| CommonNavigationParams common_params;
|
| common_params.url = url;
|
| common_params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault);
|
| common_params.transition = ui::PAGE_TRANSITION_LINK;
|
| - common_params.gesture =
|
| - has_user_gesture ? NavigationGestureUser : NavigationGestureAuto;
|
| OnBeginNavigation(common_params, begin_params);
|
| }
|
| }
|
| @@ -488,7 +485,7 @@ void TestRenderFrameHost::SimulateWillStartRequest(
|
| return;
|
| navigation_handle()->CallWillStartRequestForTesting(
|
| false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault),
|
| - transition, false /* is_external_protocol */);
|
| + true /* user_gesture */, transition, false /* is_external_protocol */);
|
| }
|
|
|
| } // namespace content
|
|
|