Refactor Pickle Read methods to use higher performance PickleIterator.

content/browser/download/base_file.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/browser/download/base_file.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 437 matching lines @@
 
   return std::string(reinterpret_cast<const char*>(hash_state.data()),
                      hash_state.size());
 }
 
 bool BaseFile::SetHashState(const std::string& hash_state_bytes) {
   if (!calculate_hash_)
     return false;
 
   Pickle hash_state(hash_state_bytes.c_str(), hash_state_bytes.size());
-  void* data_iterator = NULL;
+  PickleIterator data_iterator(hash_state);
 
-  return secure_hash_->Deserialize(&data_iterator, &hash_state);
+  return secure_hash_->Deserialize(&data_iterator);
 }
 
 bool BaseFile::IsEmptyHash(const std::string& hash) {
   return (hash.size() == kSha256HashLen &&
           0 == memcmp(hash.data(), kEmptySha256Hash, sizeof(kSha256HashLen)));
 }
 
 void BaseFile::AnnotateWithSourceInformation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
@@ skipping 91 matching lines @@
 int64 BaseFile::CurrentSpeedAtTime(base::TimeTicks current_time) const {
   base::TimeDelta diff = current_time - start_tick_;
   int64 diff_ms = diff.InMilliseconds();
   return diff_ms == 0 ? 0 : bytes_so_far() * 1000 / diff_ms;
 }
 
 int64 BaseFile::CurrentSpeed() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return CurrentSpeedAtTime(base::TimeTicks::Now());
 }