Change most uses of Pickle to base::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 ParamTraits<scoped_refptr<net::HttpResponseHeaders>>::Read(
+    const Message* m,
+    base::PickleIterator* iter,
+    param_type* r) {
   bool has_object;
   if (!ReadParam(m, iter, &has_object))
     return false;
   if (has_object)
     *r = new net::HttpResponseHeaders(iter);
   return true;
 }
 
 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log(
     const param_type& p, std::string* l) {
@@ skipping 25 matching lines @@
       DCHECK(p.type() == storage::DataElement::TYPE_BLOB);
       WriteParam(m, p.blob_uuid());
       WriteParam(m, p.offset());
       WriteParam(m, p.length());
       break;
     }
   }
 }
 
 bool ParamTraits<storage::DataElement>::Read(const Message* m,
-                                             PickleIterator* iter,
+                                             base::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))
         return false;
@@ skipping 60 matching lines @@
   if (p.get()) {
     WriteParam(m, p->http_status_code);
     WriteParam(m, p->http_status_text);
     WriteParam(m, p->request_headers);
     WriteParam(m, p->response_headers);
     WriteParam(m, p->request_headers_text);
     WriteParam(m, p->response_headers_text);
   }
 }
 
-bool ParamTraits<scoped_refptr<content::ResourceDevToolsInfo> >::Read(
-    const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<scoped_refptr<content::ResourceDevToolsInfo>>::Read(
+    const Message* m,
+    base::PickleIterator* iter,
+    param_type* r) {
   bool has_object;
   if (!ReadParam(m, iter, &has_object))
     return false;
   if (!has_object)
     return true;
   *r = new content::ResourceDevToolsInfo();
   return
       ReadParam(m, iter, &(*r)->http_status_code) &&
       ReadParam(m, iter, &(*r)->http_status_text) &&
       ReadParam(m, iter, &(*r)->request_headers) &&
@@ skipping 28 matching lines @@
   WriteParam(m, p.connect_timing.dns_end);
   WriteParam(m, p.connect_timing.connect_start);
   WriteParam(m, p.connect_timing.connect_end);
   WriteParam(m, p.connect_timing.ssl_start);
   WriteParam(m, p.connect_timing.ssl_end);
   WriteParam(m, p.send_start);
   WriteParam(m, p.send_end);
   WriteParam(m, p.receive_headers_end);
 }
 
-bool ParamTraits<net::LoadTimingInfo>::Read(
-    const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<net::LoadTimingInfo>::Read(const Message* m,
+                                            base::PickleIterator* iter,
+                                            param_type* r) {
   bool has_no_times;
   if (!ReadParam(m, iter, &r->socket_log_id) ||
       !ReadParam(m, iter, &r->socket_reused) ||
       !ReadParam(m, iter, &has_no_times)) {
     return false;
   }
   if (has_no_times)
     return true;
 
   return
@@ skipping 50 matching lines @@
 void ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Write(
     Message* m,
     const param_type& p) {
   WriteParam(m, p.get() != NULL);
   if (p.get()) {
     WriteParam(m, *p->elements());
     WriteParam(m, p->identifier());
   }
 }
 
-bool ParamTraits<scoped_refptr<content::ResourceRequestBody> >::Read(
+bool ParamTraits<scoped_refptr<content::ResourceRequestBody>>::Read(
     const Message* m,
-    PickleIterator* iter,
+    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 identifier;
   if (!ReadParam(m, iter, &identifier))
     return false;
   *r = new content::ResourceRequestBody;
   (*r)->swap_elements(&elements);
   (*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