Refactor Pickle Read methods to use higher performance PickleIterator.

crypto/secure_hash_default.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 "base/logging.h"
 #include "base/pickle.h"
 #include "crypto/third_party/nss/chromium-blapi.h"
 #include "crypto/third_party/nss/chromium-sha256.h"
 
@@ skipping 17 matching lines @@
   virtual void Update(const void* input, size_t len) {
     SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len);
   }
 
   virtual void Finish(void* output, size_t len) {
     SHA256_End(&ctx_, static_cast<unsigned char*>(output), NULL,
                static_cast<unsigned int>(len));
   }
 
   virtual bool Serialize(Pickle* pickle);
-  virtual bool Deserialize(void** data_iterator, Pickle* pickle);
+  virtual bool Deserialize(PickleIterator* data_iterator);
 
  private:
   SHA256Context ctx_;
 };
 
 bool SecureHashSHA256NSS::Serialize(Pickle* pickle) {
   if (!pickle)
     return false;
 
   if (!pickle->WriteInt(kSecureHashVersion) ||
       !pickle->WriteString(kSHA256Descriptor) ||
       !pickle->WriteBytes(&ctx_, sizeof(ctx_))) {
     return false;
   }
 
   return true;
 }
 
-bool SecureHashSHA256NSS::Deserialize(void** data_iterator, Pickle* pickle) {
-  if (!pickle)
-    return false;
-
+bool SecureHashSHA256NSS::Deserialize(PickleIterator* data_iterator) {
   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 SecureHashSHA256NSS();
     default:
       NOTIMPLEMENTED();
       return NULL;
   }
 }
 
 }  // namespace crypto