Merge ResourceRequestBodyImpl and ResourceRequestBody.

content/common/resource_messages.cc

 // 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.
 
 #include "content/common/resource_messages.h"
 
 #include "net/base/load_timing_info.h"
 #include "net/http/http_response_headers.h"
 
 namespace IPC {
@@ skipping 511 matching lines @@
   LogParam(p.send_end, l);
   l->append(", ");
   LogParam(p.receive_headers_end, l);
   l->append(", ");
   LogParam(p.push_start, l);
   l->append(", ");
   LogParam(p.push_end, l);
   l->append(")");
 }
 
-void ParamTraits<scoped_refptr<content::ResourceRequestBodyImpl>>::GetSize(
+void ParamTraits<scoped_refptr<content::ResourceRequestBody>>::GetSize(
     base::PickleSizer* s,
     const param_type& p) {
   GetParamSize(s, p.get() != NULL);
   if (p.get()) {
     GetParamSize(s, *p->elements());
     GetParamSize(s, p->identifier());
     GetParamSize(s, p->contains_sensitive_info());
   }
 }
 
-void ParamTraits<scoped_refptr<content::ResourceRequestBodyImpl>>::Write(
+void ParamTraits<scoped_refptr<content::ResourceRequestBody>>::Write(
     base::Pickle* m,
     const param_type& p) {
   WriteParam(m, p.get() != NULL);
   if (p.get()) {
     WriteParam(m, *p->elements());
     WriteParam(m, p->identifier());
     WriteParam(m, p->contains_sensitive_info());
   }
 }
 
-bool ParamTraits<scoped_refptr<content::ResourceRequestBodyImpl>>::Read(
+bool ParamTraits<scoped_refptr<content::ResourceRequestBody>>::Read(
     const base::Pickle* m,
     base::PickleIterator* iter,
     param_type* r) {
   bool has_object;
   if (!ReadParam(m, iter, &has_object))
     return false;
   if (!has_object)
     return true;
   std::vector<storage::DataElement> elements;
   if (!ReadParam(m, iter, &elements))
     return false;
   int64_t identifier;
   if (!ReadParam(m, iter, &identifier))
     return false;
   bool contains_sensitive_info;
   if (!ReadParam(m, iter, &contains_sensitive_info))
     return false;
-  *r = new content::ResourceRequestBodyImpl;
+  *r = new content::ResourceRequestBody;
   (*r)->swap_elements(&elements);
   (*r)->set_identifier(identifier);
   (*r)->set_contains_sensitive_info(contains_sensitive_info);
   return true;
 }
 
-void ParamTraits<scoped_refptr<content::ResourceRequestBodyImpl>>::Log(
+void ParamTraits<scoped_refptr<content::ResourceRequestBody>>::Log(
     const param_type& p,
     std::string* l) {
-  l->append("<ResourceRequestBodyImpl>");
+  l->append("<ResourceRequestBody>");
 }
 
 void ParamTraits<scoped_refptr<net::ct::SignedCertificateTimestamp>>::GetSize(
     base::PickleSizer* s,
     const param_type& p) {
   GetParamSize(s, p.get() != NULL);
   if (p.get()) {
     GetParamSize(s, static_cast<unsigned int>(p->version));
     GetParamSize(s, p->log_id);
     GetParamSize(s, p->timestamp);
@@ skipping 27 matching lines @@
   return true;
 }
 
 void ParamTraits<scoped_refptr<net::ct::SignedCertificateTimestamp>>::Log(
     const param_type& p,
     std::string* l) {
   l->append("<SignedCertificateTimestamp>");
 }
 
 }  // namespace IPC