Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: content/test/test_render_frame_host.cc

Issue 2657323003: Convert HistoryTabHelper to use the new navigation callbacks. (Closed)
Patch Set: nit Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/test_render_frame_host.h" 5 #include "content/test/test_render_frame_host.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "content/browser/frame_host/frame_tree.h" 9 #include "content/browser/frame_host/frame_tree.h"
10 #include "content/browser/frame_host/navigation_handle_impl.h" 10 #include "content/browser/frame_host/navigation_handle_impl.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 OnDetach(); 105 OnDetach();
106 } 106 }
107 107
108 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) { 108 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) {
109 if (IsBrowserSideNavigationEnabled()) { 109 if (IsBrowserSideNavigationEnabled()) {
110 SendRendererInitiatedNavigationRequest(url, false); 110 SendRendererInitiatedNavigationRequest(url, false);
111 return; 111 return;
112 } 112 }
113 113
114 OnDidStartLoading(true); 114 OnDidStartLoading(true);
115 OnDidStartProvisionalLoad(url, base::TimeTicks::Now()); 115 OnDidStartProvisionalLoad(url, std::vector<GURL>(), base::TimeTicks::Now());
116 SimulateWillStartRequest(ui::PAGE_TRANSITION_LINK); 116 SimulateWillStartRequest(ui::PAGE_TRANSITION_LINK);
117 } 117 }
118 118
119 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) { 119 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) {
120 if (IsBrowserSideNavigationEnabled()) { 120 if (IsBrowserSideNavigationEnabled()) {
121 NavigationRequest* request = frame_tree_node_->navigation_request(); 121 NavigationRequest* request = frame_tree_node_->navigation_request();
122 if (!request->loader_for_testing()) { 122 if (!request->loader_for_testing()) {
123 base::RunLoop loop; 123 base::RunLoop loop;
124 request->set_on_start_checks_complete_closure_for_testing( 124 request->set_on_start_checks_complete_closure_for_testing(
125 loop.QuitClosure()); 125 loop.QuitClosure());
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params; 207 FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params;
208 error_params.error_code = error_code; 208 error_params.error_code = error_code;
209 error_params.url = url; 209 error_params.url = url;
210 OnDidFailProvisionalLoadWithError(error_params); 210 OnDidFailProvisionalLoadWithError(error_params);
211 } 211 }
212 212
213 void TestRenderFrameHost::SimulateNavigationErrorPageCommit() { 213 void TestRenderFrameHost::SimulateNavigationErrorPageCommit() {
214 CHECK(navigation_handle()); 214 CHECK(navigation_handle());
215 GURL error_url = GURL(kUnreachableWebDataURL); 215 GURL error_url = GURL(kUnreachableWebDataURL);
216 OnDidStartProvisionalLoad(error_url, base::TimeTicks::Now()); 216 OnDidStartProvisionalLoad(error_url, std::vector<GURL>(),
217 base::TimeTicks::Now());
217 FrameHostMsg_DidCommitProvisionalLoad_Params params; 218 FrameHostMsg_DidCommitProvisionalLoad_Params params;
218 params.nav_entry_id = 0; 219 params.nav_entry_id = 0;
219 params.did_create_new_entry = true; 220 params.did_create_new_entry = true;
220 params.url = navigation_handle()->GetURL(); 221 params.url = navigation_handle()->GetURL();
221 params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME 222 params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME
222 : ui::PAGE_TRANSITION_LINK; 223 : ui::PAGE_TRANSITION_LINK;
223 params.was_within_same_page = false; 224 params.was_within_same_page = false;
224 params.url_is_unreachable = true; 225 params.url_is_unreachable = true;
225 params.page_state = PageState::CreateForTesting(navigation_handle()->GetURL(), 226 params.page_state = PageState::CreateForTesting(navigation_handle()->GetURL(),
226 false, nullptr, nullptr); 227 false, nullptr, nullptr);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 const GURL& url, 315 const GURL& url,
315 ui::PageTransition transition, 316 ui::PageTransition transition,
316 int response_code, 317 int response_code,
317 const ModificationCallback& callback) { 318 const ModificationCallback& callback) {
318 if (!IsBrowserSideNavigationEnabled()) 319 if (!IsBrowserSideNavigationEnabled())
319 OnDidStartLoading(true); 320 OnDidStartLoading(true);
320 321
321 // DidStartProvisionalLoad may delete the pending entry that holds |url|, 322 // DidStartProvisionalLoad may delete the pending entry that holds |url|,
322 // so we keep a copy of it to use below. 323 // so we keep a copy of it to use below.
323 GURL url_copy(url); 324 GURL url_copy(url);
324 OnDidStartProvisionalLoad(url_copy, base::TimeTicks::Now()); 325 OnDidStartProvisionalLoad(url_copy, std::vector<GURL>(),
326 base::TimeTicks::Now());
325 SimulateWillStartRequest(transition); 327 SimulateWillStartRequest(transition);
326 328
327 FrameHostMsg_DidCommitProvisionalLoad_Params params; 329 FrameHostMsg_DidCommitProvisionalLoad_Params params;
328 params.nav_entry_id = nav_entry_id; 330 params.nav_entry_id = nav_entry_id;
329 params.url = url_copy; 331 params.url = url_copy;
330 params.transition = transition; 332 params.transition = transition;
331 params.should_update_history = true; 333 params.should_update_history = true;
332 params.did_create_new_entry = did_create_new_entry; 334 params.did_create_new_entry = did_create_new_entry;
333 params.should_replace_current_entry = should_replace_entry; 335 params.should_replace_current_entry = should_replace_entry;
334 params.gesture = NavigationGestureUser; 336 params.gesture = NavigationGestureUser;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 // PlzNavigate: NavigationHandle::WillStartRequest has already been called at 507 // PlzNavigate: NavigationHandle::WillStartRequest has already been called at
506 // this point. 508 // this point.
507 if (!navigation_handle() || IsBrowserSideNavigationEnabled()) 509 if (!navigation_handle() || IsBrowserSideNavigationEnabled())
508 return; 510 return;
509 navigation_handle()->CallWillStartRequestForTesting( 511 navigation_handle()->CallWillStartRequestForTesting(
510 false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault), 512 false /* is_post */, Referrer(GURL(), blink::WebReferrerPolicyDefault),
511 true /* user_gesture */, transition, false /* is_external_protocol */); 513 true /* user_gesture */, transition, false /* is_external_protocol */);
512 } 514 }
513 515
514 } // namespace content 516 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698