Revert of Remove deprecated methods from Pickle.

net/quic/crypto/quic_server_info.cc

 // Copyright 2014 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 "net/quic/crypto/quic_server_info.h"
 
 #include <limits>
 
 #include "base/pickle.h"
 
@@ skipping 49 matching lines @@
 
   // No data was read from the disk cache.
   if (data.empty()) {
     return false;
   }
 
   Pickle p(data.data(), data.size());
   PickleIterator iter(p);
 
   int version = -1;
-  if (!iter.ReadInt(&version)) {
+  if (!p.ReadInt(&iter, &version)) {
     DVLOG(1) << "Missing version";
     return false;
   }
 
   if (version != kQuicCryptoConfigVersion) {
     DVLOG(1) << "Unsupported version";
     return false;
   }
 
-  if (!iter.ReadString(&state->server_config)) {
+  if (!p.ReadString(&iter, &state->server_config)) {
     DVLOG(1) << "Malformed server_config";
     return false;
   }
-  if (!iter.ReadString(&state->source_address_token)) {
+  if (!p.ReadString(&iter, &state->source_address_token)) {
     DVLOG(1) << "Malformed source_address_token";
     return false;
   }
-  if (!iter.ReadString(&state->server_config_sig)) {
+  if (!p.ReadString(&iter, &state->server_config_sig)) {
     DVLOG(1) << "Malformed server_config_sig";
     return false;
   }
 
   // Read certs.
   uint32 num_certs;
-  if (!iter.ReadUInt32(&num_certs)) {
+  if (!p.ReadUInt32(&iter, &num_certs)) {
     DVLOG(1) << "Malformed num_certs";
     return false;
   }
 
   for (uint32 i = 0; i < num_certs; i++) {
     string cert;
-    if (!iter.ReadString(&cert)) {
+    if (!p.ReadString(&iter, &cert)) {
       DVLOG(1) << "Malformed cert";
       return false;
     }
     state->certs.push_back(cert);
   }
 
   return true;
 }
 
 string QuicServerInfo::Serialize() {
@@ skipping 19 matching lines @@
       return string();
     }
   }
 
   return string(reinterpret_cast<const char *>(p.data()), p.size());
 }
 
 QuicServerInfoFactory::~QuicServerInfoFactory() {}
 
 }  // namespace net