PlzNavigate: Remove the RequestNavigation IPC

content/browser/frame_host/navigation_request_info.h

Index: content/browser/frame_host/navigation_request_info.h
diff --git a/content/browser/frame_host/navigation_request_info.h b/content/browser/frame_host/navigation_request_info.h
index 70bb78729ddcc5578258eb9b536bf2f1c8883971..9942ed74dc009a31a0759df9b6d0810a369c476a 100644
--- a/content/browser/frame_host/navigation_request_info.h
+++ b/content/browser/frame_host/navigation_request_info.h
@@ -8,31 +8,36 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
-#include "content/common/frame_messages.h"
+#include "content/common/navigation_params.h"
 #include "content/public/common/referrer.h"
 #include "url/gurl.h"
 
 namespace content {
+class ResourceRequestBody;
 
 // A struct to hold the parameters needed to start a navigation request in
 // ResourceDispatcherHost. It is initialized on the UI thread, and then passed
 // to the IO thread by a NavigationRequest object.
 struct CONTENT_EXPORT NavigationRequestInfo {
-  explicit NavigationRequestInfo(
-      const FrameHostMsg_BeginNavigation_Params& params);
+  NavigationRequestInfo(const BeginNavigationParams& params,
+                        const GURL& first_party_for_cookies,
+                        bool is_main_frame,
+                        bool parent_is_main_frame,
+                        scoped_refptr<ResourceRequestBody> request_body);
+  ~NavigationRequestInfo();
 
-  const FrameHostMsg_BeginNavigation_Params navigation_params;
-
-  // ---------------------------------------------------------------------------
-  // The following parameters should be filled in by RenderFrameHostManager
-  // before the navigation request is sent to the ResourceDispatcherHost.
+  const BeginNavigationParams begin_params;

[davidben, 2015/02/03 02:23:21]

Perhaps CommonNavigationParams should also be placed here. It's a little odd
that NavigationURLLoader gets some parameters out of NavigationRequestInfo and
some out of an explicitly-passed CommonNavigationParams.

[clamy, 2015/02/03 16:17:09]

Done. Note that this is a copy of CommonNavigationParams since NavigationRequest
releases the ownership of the NavigationRequestInfo in BeginNavigation.

 
   // Usually the URL of the document in the top-level window, which may be
   // checked by the third-party cookie blocking policy.
-  GURL first_party_for_cookies;
-  bool is_main_frame;
-  bool parent_is_main_frame;
+  const GURL first_party_for_cookies;
+
+  const bool is_main_frame;
+  const bool parent_is_main_frame;
+
+  scoped_refptr<ResourceRequestBody> request_body;
 };
 
 }  // namespace content