Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/common/navigation_params.h

Index: content/common/navigation_params.h
diff --git a/content/common/navigation_params.h b/content/common/navigation_params.h
index 449003595cb6682ee8416e1f9acb23e6e82e1336..c9439ee90bfced4859c2818d868eb6eccda290db 100644
--- a/content/common/navigation_params.h
+++ b/content/common/navigation_params.h
@@ -17,11 +17,11 @@
 #include "content/common/content_export.h"
 #include "content/common/content_security_policy/csp_disposition_enum.h"
 #include "content/common/frame_message_enums.h"
-#include "content/common/resource_request_body_impl.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/previews_state.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/request_context_type.h"
+#include "content/public/common/resource_request_body.h"
 #include "content/public/common/resource_response.h"
 #include "net/url_request/redirect_info.h"
 #include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
@@ -61,23 +61,22 @@ struct CONTENT_EXPORT SourceLocation {
 // Used by all navigation IPCs.
 struct CONTENT_EXPORT CommonNavigationParams {
   CommonNavigationParams();
-  CommonNavigationParams(
-      const GURL& url,
-      const Referrer& referrer,
-      ui::PageTransition transition,
-      FrameMsg_Navigate_Type::Value navigation_type,
-      bool allow_download,
-      bool should_replace_current_entry,
-      base::TimeTicks ui_timestamp,
-      FrameMsg_UILoadMetricsReportType::Value report_type,
-      const GURL& base_url_for_data_url,
-      const GURL& history_url_for_data_url,
-      PreviewsState previews_state,
-      const base::TimeTicks& navigation_start,
-      std::string method,
-      const scoped_refptr<ResourceRequestBodyImpl>& post_data,
-      base::Optional<SourceLocation> source_location,
-      CSPDisposition should_check_main_world_csp);
+  CommonNavigationParams(const GURL& url,
+                         const Referrer& referrer,
+                         ui::PageTransition transition,
+                         FrameMsg_Navigate_Type::Value navigation_type,
+                         bool allow_download,
+                         bool should_replace_current_entry,
+                         base::TimeTicks ui_timestamp,
+                         FrameMsg_UILoadMetricsReportType::Value report_type,
+                         const GURL& base_url_for_data_url,
+                         const GURL& history_url_for_data_url,
+                         PreviewsState previews_state,
+                         const base::TimeTicks& navigation_start,
+                         std::string method,
+                         const scoped_refptr<ResourceRequestBody>& post_data,
+                         base::Optional<SourceLocation> source_location,
+                         CSPDisposition should_check_main_world_csp);
   CommonNavigationParams(const CommonNavigationParams& other);
   ~CommonNavigationParams();
 
@@ -137,7 +136,7 @@ struct CONTENT_EXPORT CommonNavigationParams {
   std::string method;
 
   // Body of HTTP POST request.
-  scoped_refptr<ResourceRequestBodyImpl> post_data;
+  scoped_refptr<ResourceRequestBody> post_data;
 
   // PlzNavigate
   // Information about the Javascript source for this navigation. Used for