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

Unified Diff: content/browser/renderer_host/test_render_view_host.cc

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Some cleanup. Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/test_render_view_host.cc
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index 6effb34fa50ff5311e40b2eb88788b12c9d62f96..57fbd94e394c87e770faf0323adaf04186881c45 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -293,7 +293,8 @@ void TestRenderViewHost::SendNavigateWithTransition(
void TestRenderViewHost::SendNavigateWithOriginalRequestURL(
int page_id, const GURL& url, const GURL& original_request_url) {
- OnDidStartProvisionalLoadForFrame(kFrameId, -1, true, url);
+ main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
+ kFrameId, -1, true, url);
SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
original_request_url, 200, 0);
}
@@ -310,7 +311,8 @@ void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode(
// DidStartProvisionalLoad may delete the pending entry that holds |url|,
// so we keep a copy of it to use in SendNavigateWithParameters.
GURL url_copy(url);
- OnDidStartProvisionalLoadForFrame(kFrameId, -1, true, url_copy);
+ main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
+ kFrameId, -1, true, url_copy);
SendNavigateWithParameters(page_id, url_copy, transition, url_copy,
response_code, 0);
}
@@ -420,6 +422,10 @@ TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
return static_cast<TestRenderViewHost*>(active_rvh());
}
+TestRenderFrameHost* RenderViewHostImplTestHarness::test_main_rfh() {
+ return static_cast<TestRenderFrameHost*>(main_rfh());
+}
+
TestWebContents* RenderViewHostImplTestHarness::contents() {
return static_cast<TestWebContents*>(web_contents());
}

Powered by Google App Engine
This is Rietveld 408576698