Revert of Remove deprecated methods from Pickle.

content/common/ssl_status_serialization.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/ssl_status_serialization.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 
 namespace content {
@@ skipping 36 matching lines @@
     *cert_status = 0;
     *security_bits = -1;
     *ssl_connection_status = 0;
     signed_certificate_timestamp_ids->clear();
     return false;
   }
 
   Pickle pickle(state.data(), static_cast<int>(state.size()));
   PickleIterator iter(pickle);
   int num_scts_to_read;
-  if (!iter.ReadInt(cert_id) ||
-      !iter.ReadUInt32(cert_status) ||
-      !iter.ReadInt(security_bits) ||
-      !iter.ReadInt(ssl_connection_status) ||
-      !iter.ReadInt(&num_scts_to_read))
+  if (!pickle.ReadInt(&iter, cert_id) ||
+      !pickle.ReadUInt32(&iter, cert_status) ||
+      !pickle.ReadInt(&iter, security_bits) ||
+      !pickle.ReadInt(&iter, ssl_connection_status) ||
+      !pickle.ReadInt(&iter, &num_scts_to_read))
     return false;
 
   for (; num_scts_to_read > 0; --num_scts_to_read) {
     int id;
     uint16 status;
-    if (!iter.ReadInt(&id) || !iter.ReadUInt16(&status))
+    if (!pickle.ReadInt(&iter, &id) ||
+        !pickle.ReadUInt16(&iter, &status))
       return false;
     signed_certificate_timestamp_ids->push_back(
         SignedCertificateTimestampIDAndStatus(
             id,
             static_cast<net::ct::SCTVerifyStatus>(status)));
   }
 
   return true;
 }
 
 }  // namespace content