Make NavigationParams clearer

content/browser/frame_host/navigation_entry_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/frame_message_enums.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/ssl_status.h"
 
 namespace content {
-class NavigationControllerImpl;
-struct CommitNavigationParams;
 struct CommonNavigationParams;
-struct HistoryNavigationParams;
+struct RequestNavigationParams;
 struct StartNavigationParams;
 
 class CONTENT_EXPORT NavigationEntryImpl
     : public NON_EXPORTED_BASE(NavigationEntry) {
  public:
   // Represents a tree of FrameNavigationEntries that make up this joint session
   // history item.  The tree currently only tracks the main frame.
   // TODO(creis): Populate the tree with subframe entries in --site-per-process.
   struct TreeNode {
     TreeNode(FrameNavigationEntry* frame_entry);
@@ skipping 82 matching lines @@
 
   // Creates a copy of this NavigationEntryImpl that can be modified
   // independently from the original.  Does not copy any value that would be
   // cleared in ResetForCommit.
   // TODO(creis): Once we start sharing FrameNavigationEntries between
   // NavigationEntryImpls, we will need to support two versions of Clone: one
   // that shares the existing FrameNavigationEntries (for use within the same
   // tab) and one that draws them from a different pool (for use in a new tab).
   NavigationEntryImpl* Clone() const;
 
+  // Helper functions to construct NavigationParameters for a navigation to this
+  // NavigationEntry.
+  CommonNavigationParams ConstructCommonNavigationParams(
+      FrameMsg_Navigate_Type::Value navigation_type) const;
+  StartNavigationParams ConstructStartNavigationParams() const;
+  RequestNavigationParams ConstructRequestNavigationParams(
+      base::TimeTicks navigation_start,
+      int pending_offset_to_send,
+      int current_offset_to_send,
+      int current_length_to_send) const;
+
   // Once a navigation entry is committed, we should no longer track several
   // pieces of non-persisted state, as documented on the members below.
   void ResetForCommit();
 
   void set_unique_id(int unique_id) {
     unique_id_ = unique_id;
   }
 
   // The SiteInstance represents which pages must share processes. This is a
   // reference counted pointer to a shared SiteInstance.
@@ skipping 118 matching lines @@
   int64 frame_tree_node_id() const {
     return frame_tree_node_id_;
   }
   void set_frame_tree_node_id(int64 frame_tree_node_id) {
     frame_tree_node_id_ = frame_tree_node_id;
   }
 
   // Returns the history URL for a data URL to use in Blink.
   GURL GetHistoryURLForDataURL() const;
 
-  CommonNavigationParams ConstructCommonNavigationParams(
-      FrameMsg_Navigate_Type::Value navigation_type) const;
-  CommitNavigationParams ConstructCommitNavigationParams(
-      base::TimeTicks navigation_start) const;
-  HistoryNavigationParams ConstructHistoryNavigationParams(
-      NavigationControllerImpl* controller) const;
-  StartNavigationParams ConstructStartNavigationParams() const;
-
 #if defined(OS_ANDROID)
   base::TimeTicks intent_received_timestamp() const {
     return intent_received_timestamp_;
   }
 
   void set_intent_received_timestamp(
       const base::TimeTicks intent_received_timestamp) {
     intent_received_timestamp_ = intent_received_timestamp;
   }
 #endif
@@ skipping 130 matching lines @@
   // persisted, unless specific data is taken out/put back in at save/restore
   // time (see TabNavigation for an example of this).
   std::map<std::string, base::string16> extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_