Move DidCommitProvisionalLoad code from RenderView to RenderFrame.

content/test/test_render_frame_host.cc

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 e9a3bc8d3e30be01812a0f78357fe520491675ea..5f15b4452f0a7a761e9e038f1b26e0c6b3507d7f 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -5,8 +5,15 @@
 #include "content/test/test_render_frame_host.h"
 
 #include "content/browser/frame_host/frame_tree.h"
+#include "content/common/frame_messages.h"
 #include "content/test/test_render_view_host.h"
 
+namespace {
+
+const int64 kFrameId = 13UL;
+
+}  // namespace
+
 namespace content {
 
 TestRenderFrameHost::TestRenderFrameHost(RenderViewHostImpl* render_view_host,
@@ -30,4 +37,79 @@ TestRenderFrameHost::TestRenderFrameHost(RenderViewHostImpl* render_view_host,
 
 TestRenderFrameHost::~TestRenderFrameHost() {}
 
+void TestRenderFrameHost::SendNavigate(int page_id, const GURL& url) {
+  SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK);
+}
+
+void TestRenderFrameHost::SendNavigateWithTransition(
+    int page_id,
+    const GURL& url,
+    PageTransition transition) {
+  SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200);
+}
+
+void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode(
+    int page_id,
+    const GURL& url, PageTransition transition,
+    int response_code) {
+  // 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);
+  SendNavigateWithParameters(
+      page_id, url_copy, transition, url_copy, response_code, 0);
+}
+
+void TestRenderFrameHost::SendNavigateWithOriginalRequestURL(
+    int page_id,
+    const GURL& url,
+    const GURL& original_request_url) {
+  OnDidStartProvisionalLoadForFrame(kFrameId, -1, true, url);
+  SendNavigateWithParameters(
+      page_id, url, PAGE_TRANSITION_LINK, original_request_url, 200, 0);
+}
+
+void TestRenderFrameHost::SendNavigateWithParams(
+    FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
+  params->frame_id = kFrameId;
+  FrameHostMsg_DidCommitProvisionalLoad msg(1, *params);
+  OnNavigate(msg);
+}
+
+void TestRenderFrameHost::SendNavigateWithParameters(
+    int page_id,
+    const GURL& url,
+    PageTransition transition,
+    const GURL& original_request_url,
+    int response_code,
+    const base::FilePath* file_path_for_history_item) {
+  FrameHostMsg_DidCommitProvisionalLoad_Params params;
+  params.page_id = page_id;
+  params.frame_id = kFrameId;
+  params.url = url;
+  params.referrer = Referrer();
+  params.transition = transition;
+  params.redirects = std::vector<GURL>();
+  params.should_update_history = true;
+  params.searchable_form_url = GURL();
+  params.searchable_form_encoding = std::string();
+  params.security_info = std::string();
+  params.gesture = NavigationGestureUser;
+  params.is_post = false;
+  params.was_within_same_page = false;
+  params.http_status_code = response_code;
+  params.socket_address.set_host("2001:db8::1");
+  params.socket_address.set_port(80);
+  params.original_request_url = original_request_url;
+
+  params.page_state = PageState::CreateForTesting(
+      url,
+      false,
+      file_path_for_history_item ? "data" : NULL,
+      file_path_for_history_item);
+
+  FrameHostMsg_DidCommitProvisionalLoad msg(1, params);
+  OnNavigate(msg);
+}
+
 }  // namespace content