Make NavigationParams clearer

content/public/test/render_view_test.cc

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 f0e0f8c011d0b1f33a6ab6abae4c8a770c130afc..32522e053b38ba1f5ee34d6a4378800cd3be5feb 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -368,8 +368,7 @@ void RenderViewTest::Reload(const GURL& url) {
       GURL(), GURL());
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
-                                         CommitNavigationParams(),
-                                         HistoryNavigationParams());
+                                         CommitNavigationParams());
   FrameLoadWaiter(impl->GetMainRenderFrame()).Wait();
 }
 
@@ -447,13 +446,15 @@ void RenderViewTest::GoToOffset(int offset, const PageState& state) {
       GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
       FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(),
       FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
-  HistoryNavigationParams history_params(
-      state, impl->page_id_ + offset, pending_offset,
-      impl->history_list_offset_, history_list_length, false);
+  CommitNavigationParams commit_params;
+  commit_params.page_state = state;
+  commit_params.page_id = impl->page_id_ + offset;
+  commit_params.pending_history_list_offset = pending_offset;
+  commit_params.current_history_list_offset = impl->history_list_offset_;
+  commit_params.current_history_list_length = history_list_length;
 
   impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
-                                         CommitNavigationParams(),
-                                         history_params);
+                                         commit_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.