Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/common/resource_messages.h

Index: content/common/resource_messages.h
diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h
index 0d0f79747dd12a046a1d6fb09ee2ab2091f92845..66406d5b867082e432026b43ce474295c45928d2 100644
--- a/content/common/resource_messages.h
+++ b/content/common/resource_messages.h
@@ -15,10 +15,10 @@
 #include "content/common/content_param_traits_macros.h"
 #include "content/common/navigation_params.h"
 #include "content/common/resource_request.h"
-#include "content/common/resource_request_body_impl.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/common/common_param_traits.h"
+#include "content/public/common/resource_request_body.h"
 #include "content/public/common/resource_response.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/request_priority.h"
@@ -110,8 +110,8 @@ struct ParamTraits<net::LoadTimingInfo> {
 };
 
 template <>
-struct ParamTraits<scoped_refptr<content::ResourceRequestBodyImpl>> {
-  typedef scoped_refptr<content::ResourceRequestBodyImpl> param_type;
+struct ParamTraits<scoped_refptr<content::ResourceRequestBody>> {
+  typedef scoped_refptr<content::ResourceRequestBody> param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,