Make NavigationParams clearer

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_request.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_request_info.h"
@@ skipping 71 matching lines @@
     request_body->AppendBytes(
         reinterpret_cast<const char *>(
             entry.GetBrowserInitiatedPostData()->front()),
         entry.GetBrowserInitiatedPostData()->size());
   }
 
   scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
       frame_tree_node, entry.ConstructCommonNavigationParams(navigation_type),
       BeginNavigationParams(method, headers.ToString(),
                             LoadFlagFromNavigationType(navigation_type), false),
-      entry.ConstructCommitNavigationParams(navigation_start),
-      entry.ConstructHistoryNavigationParams(controller), request_body, true,
-      &entry));
+      entry.ConstructRequestNavigationParams(
+          navigation_start, controller->GetIndexOfEntry(&entry),
+          controller->GetLastCommittedEntryIndex(),
+          controller->GetEntryCount()),
+      request_body, true, &entry));
   return navigation_request.Pass();
 }
 
 // static
 scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const BeginNavigationParams& begin_params,
     scoped_refptr<ResourceRequestBody> body,
     int current_history_list_offset,
     int current_history_list_length) {
   // TODO(clamy): Check if some PageState should be provided here.
   // TODO(clamy): See how we should handle override of the user agent when the
   // navigation may start in a renderer and commit in another one.
   // TODO(clamy): See if the navigation start time should be measured in the
   // renderer and sent to the browser instead of being measured here.
-  scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
-      frame_tree_node, common_params, begin_params, CommitNavigationParams(),
-      HistoryNavigationParams(PageState(), -1, -1, current_history_list_offset,
-                              current_history_list_length, false),
-      body, false, nullptr));
+  // TODO(clamy): The pending history list offset should be properly set.
+  RequestNavigationParams request_params;
+  request_params.current_history_list_offset = current_history_list_offset;
+  request_params.current_history_list_length = current_history_list_length;
+  scoped_ptr<NavigationRequest> navigation_request(
+      new NavigationRequest(frame_tree_node, common_params, begin_params,
+                            request_params, body, false, nullptr));
   return navigation_request.Pass();
 }
 
 NavigationRequest::NavigationRequest(
     FrameTreeNode* frame_tree_node,
     const CommonNavigationParams& common_params,
     const BeginNavigationParams& begin_params,
-    const CommitNavigationParams& commit_params,
-    const HistoryNavigationParams& history_params,
+    const RequestNavigationParams& request_params,
     scoped_refptr<ResourceRequestBody> body,
     bool browser_initiated,
     const NavigationEntryImpl* entry)
     : frame_tree_node_(frame_tree_node),
       common_params_(common_params),
       begin_params_(begin_params),
-      commit_params_(commit_params),
-      history_params_(history_params),
+      request_params_(request_params),
       browser_initiated_(browser_initiated),
       state_(NOT_STARTED),
       restore_type_(NavigationEntryImpl::RESTORE_NONE),
       is_view_source_(false),
       bindings_(NavigationEntryImpl::kInvalidBindings) {
   if (entry) {
     source_site_instance_ = entry->source_site_instance();
     dest_site_instance_ = entry->site_instance();
     restore_type_ = entry->restore_type();
     is_view_source_ = entry->IsViewSourceMode();
@@ skipping 64 matching lines @@
   // TODO(davidben): Network failures should display a network error page.
   NOTIMPLEMENTED() << " where net_error=" << net_error;
 }
 
 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
   frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
                                                         common_params_.url);
 }
 
 }  // namespace content