Remove the FrameMsg_Navigate_Params

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 StartNavigationParams;
 
 class CONTENT_EXPORT NavigationEntryImpl
     : public NON_EXPORTED_BASE(NavigationEntry) {
  public:
   static NavigationEntryImpl* FromNavigationEntry(NavigationEntry* entry);
 
   // The value of bindings() before it is set during commit.
   static int kInvalidBindings;
 
   NavigationEntryImpl();
@@ skipping 191 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(

[Charlie Reis, 2015/03/17 04:01:03]

These belong much higher up in the class, after the public interface (before
ResetForCommit).

+      FrameMsg_Navigate_Type::Value navigation_type) const;
+  CommitNavigationParams ConstructCommitNavigationParams(
+      base::TimeTicks navigation_start) const;
+  HistoryNavigationParams ConstructHistoryNavigationParams(
+      NavigationControllerImpl* controller) const;

[Charlie Reis, 2015/03/17 04:01:03]

NavigationEntryImpl should not depend on NavigationControllerImpl.  Can you pass
in the offsets and length instead?

+  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 127 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_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_