Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/common/navigation_params.h

 // Copyright 2014 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_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #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"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 namespace content {
 
 // PlzNavigate
@@ skipping 19 matching lines @@
 
 // The following structures hold parameters used during a navigation. In
 // particular they are used by FrameMsg_Navigate, FrameMsg_CommitNavigation and
 // FrameHostMsg_BeginNavigation.
 
 // Provided by the browser or the renderer -------------------------------------
 
 // 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();
 
   // The URL to navigate to.
   // PlzNavigate: May be modified when the navigation is ready to commit.
   GURL url;
 
   // The URL to send in the "Referer" header field. Can be empty if there is
   // no referrer.
   Referrer referrer;
@@ skipping 39 matching lines @@
   // If this is for a browser-initiated navigation, this can override the
   // navigation_start value in Blink.
   // PlzNavigate: For renderer initiated navigations, this will be set on the
   // renderer side and sent with FrameHostMsg_BeginNavigation.
   base::TimeTicks navigation_start;
 
   // The request method: GET, POST, etc.
   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
   // providing information in console error messages triggered by the
   // navigation. If the navigation was not caused by Javascript, this should
   // not be set.
   base::Optional<SourceLocation> source_location;
 
   // Whether or not the CSP of the main world should apply. When the navigation
   // is initiated from a content script in an isolated world, the CSP defined
@@ skipping 251 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_