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

Unified Diff: content/public/test/render_view_test.cc

Issue 148083013: Move browser initiated navigation from RenderViewHost to RenderFrameHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another one bites the dust. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/accessibility/renderer_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 7bc229e169b480d0c6f1c21a6bdf9bed0f95f0b3..954397f07c4dbfd4400d4823b2c3f2f7e5ed029c 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -327,11 +327,11 @@ void RenderViewTest::ClearHistory() {
}
void RenderViewTest::Reload(const GURL& url) {
- ViewMsg_Navigate_Params params;
+ FrameMsg_Navigate_Params params;
params.url = url;
- params.navigation_type = ViewMsg_Navigate_Type::RELOAD;
+ params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
- impl->OnNavigate(params);
+ impl->main_render_frame()->OnNavigate(params);
}
uint32 RenderViewTest::GetNavigationIPCType() {
@@ -381,8 +381,8 @@ void RenderViewTest::GoToOffset(int offset,
impl->historyForwardListCount() + 1;
int pending_offset = offset + impl->history_list_offset();
- ViewMsg_Navigate_Params navigate_params;
- navigate_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params navigate_params;
+ navigate_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
navigate_params.transition = PAGE_TRANSITION_FORWARD_BACK;
navigate_params.current_history_list_length = history_list_length;
navigate_params.current_history_list_offset = impl->history_list_offset();
@@ -391,8 +391,9 @@ void RenderViewTest::GoToOffset(int offset,
navigate_params.page_state = HistoryItemToPageState(history_item);
navigate_params.request_time = base::Time::Now();
- ViewMsg_Navigate navigate_message(impl->GetRoutingID(), navigate_params);
- OnMessageReceived(navigate_message);
+ FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),
+ navigate_params);
+ impl->main_render_frame()->OnMessageReceived(navigate_message);
// The load actually happens asynchronously, so we pump messages to process
// the pending continuation.
« no previous file with comments | « content/content_common.gypi ('k') | content/renderer/accessibility/renderer_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698