Index: content/test/test_render_view_host.cc |
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc |
index 1945e9fa3cb59cb3907839f321574ade5ea7b4f5..01456fb2bd332dd2e6730440ee9cde98fd7df6f1 100644 |
--- a/content/test/test_render_view_host.cc |
+++ b/content/test/test_render_view_host.cc |
@@ -9,6 +9,7 @@ |
#include "content/browser/dom_storage/session_storage_namespace_impl.h" |
#include "content/browser/site_instance_impl.h" |
#include "content/common/dom_storage/dom_storage_types.h" |
+#include "content/common/frame_messages.h" |
#include "content/common/view_messages.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/navigation_controller.h" |
@@ -30,7 +31,7 @@ const int64 kFrameId = 13UL; |
} // namespace |
-void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, |
+void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, |
int page_id, |
const GURL& url, |
PageTransition transition) { |
@@ -302,10 +303,10 @@ void TestRenderViewHost::SendNavigateWithFile( |
} |
void TestRenderViewHost::SendNavigateWithParams( |
- ViewHostMsg_FrameNavigate_Params* params) { |
+ FrameHostMsg_DidCommitProvisionalLoad_Params* params) { |
params->frame_id = kFrameId; |
- ViewHostMsg_FrameNavigate msg(1, *params); |
- OnNavigate(msg); |
+ FrameHostMsg_DidCommitProvisionalLoad msg(1, *params); |
+ main_render_frame_host()->OnNavigate(msg); |
} |
void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode( |
@@ -324,7 +325,7 @@ void TestRenderViewHost::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) { |
- ViewHostMsg_FrameNavigate_Params params; |
+ FrameHostMsg_DidCommitProvisionalLoad_Params params; |
params.page_id = page_id; |
params.frame_id = kFrameId; |
params.url = url; |
@@ -352,8 +353,8 @@ void TestRenderViewHost::SendNavigateWithParameters( |
file_path_for_history_item ? "data" : NULL, |
file_path_for_history_item); |
- ViewHostMsg_FrameNavigate msg(1, params); |
- OnNavigate(msg); |
+ FrameHostMsg_DidCommitProvisionalLoad msg(1, params); |
+ main_render_frame_host()->OnNavigate(msg); |
} |
void TestRenderViewHost::SendShouldCloseACK(bool proceed) { |