Added member data to classes to support download resumption.

content/browser/download/base_file.cc

 // Copyright (c) 2011 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"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/download_stats.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "crypto/secure_hash.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
@@ skipping 166 matching lines @@
 
 }  // namespace
 
 // This will initialize the entire array to zero.
 const unsigned char BaseFile::kEmptySha256Hash[] = { 0 };
 
 BaseFile::BaseFile(const FilePath& full_path,
                    const GURL& source_url,
                    const GURL& referrer_url,
                    int64 received_bytes,
+                   const std::string& hash_state,
                    const linked_ptr<net::FileStream>& file_stream)
     : full_path_(full_path),
       source_url_(source_url),
       referrer_url_(referrer_url),
       file_stream_(file_stream),
       bytes_so_far_(received_bytes),
       power_save_blocker_(PowerSaveBlocker::kPowerSaveBlockPreventSystemSleep),
       calculate_hash_(false),
+      initial_hash_state_(hash_state),
       detached_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   memcpy(sha256_hash_, kEmptySha256Hash, kSha256HashLen);
   if (file_stream_.get())
     file_stream_->EnableErrorStatistics();
 }
 
 BaseFile::~BaseFile() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (detached_)
     Close();
   else
     Cancel();  // Will delete the file.
 }
 
 net::Error BaseFile::Initialize(bool calculate_hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
 
   calculate_hash_ = calculate_hash;
 
-  if (calculate_hash_)
+  if (calculate_hash_) {
     secure_hash_.reset(crypto::SecureHash::Create(crypto::SecureHash::SHA256));
+    if (!initial_hash_state_.empty() && (bytes_so_far_ > 0))

[Randy Smith (Not in Mondays), 2011/11/23 19:25:13]

I'm inclined to leave out the "bytes_so_far_" test.  I can't think of a
mechanism for initial_hash_state_ being non-empty and bytes_so_far_ being 0, but
if we want to eliminate that option we want a DCHECK or error return, not a
silent test.  And if we want to allow that option, I think that the signal of
passing in a non-zero initial hash state is the signal we should be paying
attention to.

[ahendrickson, 2011/12/20 00:04:14]

I want to be able to zero the bytes_so_far_ value to indicate that we want to
start the download from the beginning, without having to clear the hash state as
well.

[Randy Smith (Not in Mondays), 2011/12/20 17:05:40]

Why?  That seems like it's just inconsistent data, which is ok if you ignore one
piece.  But why not keep them consistent?

[ahendrickson, 2011/12/20 22:06:54]

I will try to keep them consistent.  I just think that |bytes_so_far_| is the
more important factor -- if it's 0, we have to ignore any passed-in hash state.

+      SetSha256HashState(initial_hash_state_);
+  }
 
   if (full_path_.empty()) {
     FilePath temp_file;
     FilePath download_dir =
         content::GetContentClient()->browser()->GetDefaultDownloadDirectory();
     if (!file_util::CreateTemporaryFileInDir(download_dir, &temp_file) &&
         !file_util::CreateTemporaryFile(&temp_file)) {
       return LOG_ERROR("unable to create", net::ERR_FILE_NOT_FOUND);
     }
     full_path_ = temp_file;
@@ skipping 146 matching lines @@
   Close();
 }
 
 bool BaseFile::GetSha256Hash(std::string* hash) {
   DCHECK(!detached_);
   hash->assign(reinterpret_cast<const char*>(sha256_hash_),
                sizeof(sha256_hash_));
   return (calculate_hash_ && !in_progress());
 }
 
+std::string BaseFile::GetSha256HashState() {
+  if (!calculate_hash_)
+    return "";
+
+  Pickle hash_state;
+  if (!secure_hash_->Serialize(&hash_state))
+    return "";
+
+  return std::string(reinterpret_cast<const char*>(hash_state.data()),
+                     hash_state.size());
+}
+
+bool BaseFile::SetSha256HashState(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;
+
+  return secure_hash_->Deserialize(&data_iterator, &hash_state);
+}
+
 bool BaseFile::IsEmptySha256Hash(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_);
 
 #if defined(OS_WIN)
@@ skipping 61 matching lines @@
 std::string BaseFile::DebugString() const {
   return base::StringPrintf("{ source_url_ = \"%s\""
                             " full_path_ = \"%" PRFilePath "\""
                             " bytes_so_far_ = %" PRId64
                             " detached_ = %c }",
                             source_url_.spec().c_str(),
                             full_path_.value().c_str(),
                             bytes_so_far_,
                             detached_ ? 'T' : 'F');
 }