Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/browser/loader/DEPS

 # The core loading code in this directory is being transitioned into a separate
 # Mojo networking service. See http://crbug.com/598073. The first stage is to
 # decouple the code that will be moved from the rest of content. These rules
 # help ensure that we don't add more includes, and can progressively reduce the
 # code's dependencies.
 #
 # For each file, the first section shows includes that are allowed (i.e. because
 # they are for files that will be moving as well). The second section, separated
 # by a comment, lists files that we will have to decouple.
 specific_include_rules = {
@@ skipping 109 matching lines @@
     "+content/browser/loader/resource_loader_delegate.h",
     "+content/browser/loader/resource_message_filter.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/browser/loader/resource_requester_info.h",
     "+content/browser/loader/resource_scheduler.h",
     "+content/browser/loader/stream_resource_handler.h",
     "+content/browser/loader/sync_resource_handler.h",
     "+content/browser/loader/throttling_resource_handler.h",
     "+content/browser/loader/wake_lock_resource_throttle.h",
     "+content/common/resource_request_body.h",
-    "+content/common/resource_request_body_impl.h",
     "+content/common/url_loader.mojom.h",
     "+content/public/browser/global_request_id.h",
     "+content/public/browser/resource_dispatcher_host.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/browser/resource_request_info.h",
     "+content/public/browser/resource_throttle.h",
     "+content/public/common/previews_state.h",
+    "+content/public/common/resource_request_body.h",
 
     # TODO: These all have to be removed.
     "+content/browser/appcache/appcache_interceptor.h",
     "+content/browser/appcache/appcache_navigation_handle_core.h",
     "+content/browser/appcache/chrome_appcache_service.h",
     "+content/browser/bad_message.h",
     "+content/browser/blob_storage/chrome_blob_storage_context.h",
     "+content/browser/browsing_data/clear_site_data_throttle.h",
     "+content/browser/child_process_security_policy_impl.h",
     "+content/browser/frame_host/navigation_request_info.h",
@@ skipping 75 matching lines @@
   ],
   "resource_request_info_impl\.(cc|h)": [
     "-content",
     "+content/browser/blob_storage/chrome_blob_storage_context.h",
     "+content/browser/loader/global_routing_id.h",
     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_message_filter.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/browser/loader/resource_requester_info.h",
     "+content/common/content_export.h",
-    "+content/common/resource_request_body_impl.h",
     "+content/common/url_loader.mojom.h",
     "+content/public/browser/global_request_id.h",
     "+content/public/browser/resource_request_info.h",
     "+content/public/common/previews_state.h",
     "+content/public/common/referrer.h",
+    "+content/public/common/resource_request_body.h",
     "+content/public/common/resource_type.h",
 
     # TODO: these all have to be removed.
     "+content/browser/frame_host/frame_tree_node.h",
     "+content/browser/web_contents/web_contents_impl.h",
     "+content/common/net/url_request_service_worker_data.h",
     "+content/common/net/url_request_user_data.h",
     "+content/public/browser/browser_thread.h",
     "+content/public/browser/navigation_ui_data.h",
     "+content/public/common/browser_side_navigation_policy.h",
@@ skipping 99 matching lines @@
     "+content/browser/loader/navigation_resource_throttle.h"
   ],
   "wake_lock_resource_throttle\.(cc|h)": [
     "-content",
     "+content/browser/loader/wake_lock_resource_throttle.h",
     "+content/browser/service_manager/service_manager_context.h",
     "+content/public/browser/browser_thread.h",
     "+content/public/browser/resource_throttle.h",
   ],
 }