Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/browser/loader/resource_request_info_impl.h

 // Copyright (c) 2012 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_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/supports_user_data.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/loader/resource_requester_info.h"
-#include "content/common/resource_request_body_impl.h"
 #include "content/common/url_loader.mojom.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/previews_state.h"
 #include "content/public/common/referrer.h"
+#include "content/public/common/resource_request_body.h"
 #include "content/public/common/resource_type.h"
 #include "net/base/load_states.h"
 
 namespace content {
 class DetachableResourceHandler;
 class ResourceContext;
 struct GlobalRequestID;
 struct GlobalRoutingID;
 
 // Holds the data ResourceDispatcherHost associates with each request.
@@ skipping 31 matching lines @@
       bool has_user_gesture,
       bool enable_load_timing,
       bool enable_upload_progress,
       bool do_not_prompt_for_login,
       blink::WebReferrerPolicy referrer_policy,
       blink::WebPageVisibilityState visibility_state,
       ResourceContext* context,
       bool report_raw_headers,
       bool is_async,
       PreviewsState previews_state,
-      const scoped_refptr<ResourceRequestBodyImpl> body,
+      const scoped_refptr<ResourceRequestBody> body,
       bool initiated_in_secure_context);
   ~ResourceRequestInfoImpl() override;
 
   // ResourceRequestInfo implementation:
   WebContentsGetter GetWebContentsGetterForRequest() const override;
   FrameTreeNodeIdGetter GetFrameTreeNodeIdGetterForRequest() const override;
   ResourceContext* GetContext() const override;
   int GetChildID() const override;
   int GetRouteID() const override;
   GlobalRequestID GetGlobalRequestID() const override;
@@ skipping 88 matching lines @@
 
   bool is_load_timing_enabled() const { return enable_load_timing_; }
 
   bool is_upload_progress_enabled() const { return enable_upload_progress_; }
 
   bool do_not_prompt_for_login() const { return do_not_prompt_for_login_; }
   void set_do_not_prompt_for_login(bool do_not_prompt) {
     do_not_prompt_for_login_ = do_not_prompt;
   }
 
-  const scoped_refptr<ResourceRequestBodyImpl>& body() const { return body_; }
+  const scoped_refptr<ResourceRequestBody>& body() const { return body_; }
   void ResetBody();
 
   bool initiated_in_secure_context() const {
     return initiated_in_secure_context_;
   }
   void set_initiated_in_secure_context_for_testing(bool secure) {
     initiated_in_secure_context_ = secure;
   }
 
   void set_navigation_ui_data(
@@ skipping 35 matching lines @@
   bool counted_as_in_flight_request_;
   ResourceType resource_type_;
   ui::PageTransition transition_type_;
   int memory_cost_;
   blink::WebReferrerPolicy referrer_policy_;
   blink::WebPageVisibilityState visibility_state_;
   ResourceContext* context_;
   bool report_raw_headers_;
   bool is_async_;
   PreviewsState previews_state_;
-  scoped_refptr<ResourceRequestBodyImpl> body_;
+  scoped_refptr<ResourceRequestBody> body_;
   bool initiated_in_secure_context_;
   std::unique_ptr<NavigationUIData> navigation_ui_data_;
 
   // Keeps upload body blobs alive for the duration of the request.
   BlobHandles blob_handles_;
 
   // This callback is set by MojoAsyncResourceHandler to update its mojo binding
   // and remote endpoint. This callback will be removed once PlzNavigate is
   // shipped.
   TransferCallback on_transfer_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceRequestInfoImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_