Refactor Pickle Read methods to use higher performance PickleIterator.

crypto/secure_hash_openssl.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "crypto/secure_hash.h"
 
 #include <openssl/ssl.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 21 matching lines @@
     SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len);
   }
 
   virtual void Finish(void* output, size_t len) {
     ScopedOpenSSLSafeSizeBuffer<SHA256_DIGEST_LENGTH> result(
         static_cast<unsigned char*>(output), len);
     SHA256_Final(result.safe_buffer(), &ctx_);
   }
 
   virtual bool Serialize(Pickle* pickle);
-  virtual bool Deserialize(void** data_iterator, Pickle* pickle);
+  virtual bool Deserialize(PickleIterator* data_iterator);
 
  private:
   SHA256_CTX ctx_;
 };
 
 bool SecureHashSHA256OpenSSL::Serialize(Pickle* pickle) {
   if (!pickle)
     return false;
 
   if (!pickle->WriteInt(kSecureHashVersion) ||
       !pickle->WriteString(kSHA256Descriptor) ||
       !pickle->WriteBytes(&ctx_, sizeof(ctx_))) {
     return false;
   }
 
   return true;
 }
 
-bool SecureHashSHA256OpenSSL::Deserialize(void** data_iterator,
-                                          Pickle* pickle) {
-  if (!pickle)
+bool SecureHashSHA256OpenSSL::Deserialize(PickleIterator* data_iterator) {
+  if (!data_iterator)
     return false;
 
   int version;
-  if (!pickle->ReadInt(data_iterator, &version))
+  if (!data_iterator->ReadInt(&version))
     return false;
 
   if (version > kSecureHashVersion)
     return false;  // We don't know how to deal with this.
 
   std::string type;
-  if (!pickle->ReadString(data_iterator, &type))
+  if (!data_iterator->ReadString(&type))
     return false;
 
   if (type != kSHA256Descriptor)
     return false;  // It's the wrong kind.
 
   const char* data = NULL;
-  if (!pickle->ReadBytes(data_iterator, &data, sizeof(ctx_)))
+  if (!data_iterator->ReadBytes(&data, sizeof(ctx_)))
     return false;
 
   memcpy(&ctx_, data, sizeof(ctx_));
 
   return true;
 }
 
 }  // namespace
 
 SecureHash* SecureHash::Create(Algorithm algorithm) {
   switch (algorithm) {
     case SHA256:
       return new SecureHashSHA256OpenSSL();
     default:
       NOTIMPLEMENTED();
       return NULL;
   }
 }
 
 }  // namespace crypto