Remove the FrameMsg_Navigate_Params

content/browser/frame_host/navigation_entry_impl.h

Index: content/browser/frame_host/navigation_entry_impl.h
diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h
index c69c978e0f416b60dab1fb6b7e9d9d307f56f8e9..4365e23c1f6d3a7c344464a2d7c0061a6b15d16f 100644
--- a/content/browser/frame_host/navigation_entry_impl.h
+++ b/content/browser/frame_host/navigation_entry_impl.h
@@ -10,6 +10,7 @@
 #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"
@@ -17,6 +18,11 @@
 #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) {
@@ -228,6 +234,14 @@ class CONTENT_EXPORT NavigationEntryImpl
   // 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_;