Revert of Remove deprecated methods from Pickle.

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 {
 
 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.get() != NULL);
   if (p.get()) {
     // Do not disclose Set-Cookie headers over IPC.
     p->Persist(m, net::HttpResponseHeaders::PERSIST_SANS_COOKIES);
   }
 }
 
 bool ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Read(
     const Message* m, PickleIterator* iter, param_type* r) {
   bool has_object;
   if (!ReadParam(m, iter, &has_object))
     return false;
   if (has_object)
-    *r = new net::HttpResponseHeaders(iter);
+    *r = new net::HttpResponseHeaders(*m, iter);
   return true;
 }
 
 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log(
     const param_type& p, std::string* l) {
   l->append("<HttpResponseHeaders>");
 }
 
 void ParamTraits<storage::DataElement>::Write(Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.type()));
@@ skipping 29 matching lines @@
 bool ParamTraits<storage::DataElement>::Read(const Message* m,
                                              PickleIterator* iter,
                                              param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
   switch (type) {
     case storage::DataElement::TYPE_BYTES: {
       const char* data;
       int len;
-      if (!iter->ReadData(&data, &len))
+      if (!m->ReadData(iter, &data, &len))
         return false;
       r->SetToBytes(data, len);
       break;
     }
     case storage::DataElement::TYPE_FILE: {
       base::FilePath file_path;
       uint64 offset, length;
       base::Time expected_modification_time;
       if (!ReadParam(m, iter, &file_path))
         return false;
@@ skipping 200 matching lines @@
   (*r)->set_identifier(identifier);
   return true;
 }
 
 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Log(
     const param_type& p, std::string* l) {
   l->append("<ResourceRequestBody>");
 }
 
 }  // namespace IPC