Remove the FrameMsg_Navigate_Params

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 178eb326d73a826d24c332112c0d791e5ebf24f8..309b50a7968c1b480158927ef6af44b7b1816471 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -21,6 +21,7 @@
 #include "content/common/frame_message_enums.h"
 #include "content/common/frame_replication_state.h"
 #include "content/common/mojo/service_registry_impl.h"
+#include "content/common/navigation_params.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/javascript_message_type.h"
 #include "net/http/http_response_headers.h"
@@ -38,8 +39,6 @@ struct AccessibilityHostMsg_FindInPageResultParams;
 struct AccessibilityHostMsg_LocationChangeParams;
 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params;
 struct FrameHostMsg_OpenURL_Params;
-struct FrameHostMsg_BeginNavigation_Params;
-struct FrameMsg_Navigate_Params;
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
 struct FrameHostMsg_ShowPopup_Params;
 #endif
@@ -66,12 +65,8 @@ class RenderWidgetHostView;
 class ResourceRequestBody;
 class StreamHandle;
 class TimeoutMonitor;
-struct BeginNavigationParams;
-struct CommitNavigationParams;
-struct CommonNavigationParams;
 struct ContextMenuParams;
 struct GlobalRequestID;
-struct HistoryNavigationParams;
 struct Referrer;
 struct ResourceResponse;
 struct TransitionLayerData;
@@ -301,7 +296,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // If a cross-site request is in progress, we may be suspended while waiting
   // for the onbeforeunload handler, so this function might buffer the message
   // rather than sending it.
-  void Navigate(const FrameMsg_Navigate_Params& params);
+  void Navigate(const CommonNavigationParams& common_params,
+                const StartNavigationParams& start_params,
+                const CommitNavigationParams& commit_params,
+                const HistoryNavigationParams& history_params);
 
   // Load the specified URL; this is a shortcut for Navigate().
   void NavigateToURL(const GURL& url);
@@ -629,12 +627,27 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // RenderFrameHost.
   bool navigations_suspended_;
 
-  // We only buffer the params for a suspended navigation while this RFH is the
-  // pending RenderFrameHost of a RenderFrameHostManager. There will only ever
-  // be one suspended navigation, because RenderFrameHostManager will destroy
-  // the pending RenderFrameHost and create a new one if a second navigation
-  // occurs.
-  scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_;
+  // Holds the parameters for a suspended navigation. This can only happen while
+  // this RFH is the pending RenderFrameHost of a RenderFrameHostManager. There
+  // will only ever be one suspended navigation, because RenderFrameHostManager
+  // will destroy the pending RenderFrameHost and create a new one if a second
+  // navigation occurs.
+  // PlzNavigate: unused as navigations are never suspended.
+  struct NavigateParams {

[nasko, 2015/03/09 23:24:23]

Let's name this so that it is obvious it is used only for suspended navigations.
Let's say SuspendedNavigationParams?

[clamy, 2015/03/10 16:45:44]

I've moved it to navigation_params.h to reuse in RenderViewImpl.

+    NavigateParams(const CommonNavigationParams& common_params,
+                   const StartNavigationParams& start_params,
+                   const CommitNavigationParams& commit_params,
+                   const HistoryNavigationParams& history_params);
+    ~NavigateParams();
+
+    const CommonNavigationParams common_params;
+    const StartNavigationParams start_params;
+    // The navigation start timestamp in |commit_params| is updated with the
+    // time at which BeforeUnload completed.
+    CommitNavigationParams commit_params;
+    const HistoryNavigationParams history_params;
+  };
+  scoped_ptr<NavigateParams> suspended_nav_params_;
 
   // When the last BeforeUnload message was sent.
   base::TimeTicks send_before_unload_start_time_;