| 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 b0f2570c993fd3e96d32ffd3d9ab24c10e0a73fd..d9f6a1e6661999b1bb9f74fd353adb00ab3ff902 100644
|
| --- a/content/public/test/render_view_test.cc
|
| +++ b/content/public/test/render_view_test.cc
|
| @@ -338,8 +338,8 @@ void RenderViewTest::ClearHistory() {
|
|
|
| void RenderViewTest::Reload(const GURL& url) {
|
| FrameMsg_Navigate_Params params;
|
| - params.url = url;
|
| - params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
|
| + params.core_params.url = url;
|
| + params.core_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
|
| RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
|
| impl->GetMainRenderFrame()->OnNavigate(params);
|
| FrameLoadWaiter(impl->GetMainRenderFrame()).Wait();
|
| @@ -411,13 +411,15 @@ void RenderViewTest::GoToOffset(int offset, const PageState& state) {
|
| int pending_offset = offset + impl->history_list_offset();
|
|
|
| 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();
|
| - navigate_params.pending_history_list_offset = pending_offset;
|
| - navigate_params.page_id = impl->page_id_ + offset;
|
| - navigate_params.page_state = state;
|
| + navigate_params.core_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
|
| + navigate_params.core_params.transition = PAGE_TRANSITION_FORWARD_BACK;
|
| + navigate_params.commit_params.current_history_list_length =
|
| + history_list_length;
|
| + navigate_params.commit_params.current_history_list_offset =
|
| + impl->history_list_offset();
|
| + navigate_params.commit_params.pending_history_list_offset = pending_offset;
|
| + navigate_params.commit_params.page_id = impl->page_id_ + offset;
|
| + navigate_params.commit_params.page_state = state;
|
| navigate_params.request_time = base::Time::Now();
|
|
|
| FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(),
|
|
|