Added member data to classes to support download resumption.

content/browser/download/download_file_impl.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/download_file_impl.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/stringprintf.h"
@@ skipping 68 matching lines @@
   }
 
   return -1;
 }
 
 }
 
 DownloadFileImpl::DownloadFileImpl(
     const DownloadCreateInfo* info,
     DownloadRequestHandleInterface* request_handle,
-    content::DownloadManager* download_manager)
+    content::DownloadManager* download_manager,
+    bool calculate_hash)
     : file_(info->save_info.file_path,
             info->url(),
             info->referrer_url,
             info->received_bytes,
+            calculate_hash,
+            info->save_info.hash_state,
             info->save_info.file_stream),
       id_(info->download_id),
       request_handle_(request_handle),
       download_manager_(download_manager) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 }
 
 DownloadFileImpl::~DownloadFileImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 }
 
 // BaseFile delegated functions.
-net::Error DownloadFileImpl::Initialize(bool calculate_hash) {
-  return file_.Initialize(calculate_hash);
+net::Error DownloadFileImpl::Initialize() {
+  return file_.Initialize();
 }
 
 net::Error DownloadFileImpl::AppendDataToFile(const char* data,
                                               size_t data_len) {
   return file_.AppendDataToFile(data, data_len);
 }
 
 net::Error DownloadFileImpl::Rename(const FilePath& full_path) {
   return file_.Rename(full_path);
 }
@@ skipping 23 matching lines @@
 }
 
 int64 DownloadFileImpl::BytesSoFar() const {
   return file_.bytes_so_far();
 }
 
 int64 DownloadFileImpl::CurrentSpeed() const {
   return file_.CurrentSpeed();
 }
 
-bool DownloadFileImpl::GetSha256Hash(std::string* hash) {
-  return file_.GetSha256Hash(hash);
+bool DownloadFileImpl::GetHash(std::string* hash) {
+  return file_.GetHash(hash);
+}
+
+std::string DownloadFileImpl::GetHashState() {
+  return file_.GetHashState();
 }
 
 // DownloadFileInterface implementation.
 void DownloadFileImpl::CancelDownloadRequest() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   request_handle_->CancelRequest();
 }
 
 int DownloadFileImpl::Id() const {
   return id_.local();
@@ skipping 11 matching lines @@
 std::string DownloadFileImpl::DebugString() const {
   return base::StringPrintf("{"
                             " id_ = " "%d"
                             " request_handle = %s"
                             " Base File = %s"
                             " }",
                             id_.local(),
                             request_handle_->DebugString().c_str(),
                             file_.DebugString().c_str());
 }