Added member data to classes to support download resumption.

content/browser/download/download_file_manager.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_manager.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 52 matching lines @@
   DCHECK(info);
   VLOG(20) << __FUNCTION__ << "()" << " info = " << info->DebugString();
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Life of |info| ends here. No more references to it after this method.
   scoped_ptr<DownloadCreateInfo> infop(info);
 
   scoped_ptr<DownloadFile>
       download_file(new DownloadFile(info,
                                      new DownloadRequestHandle(request_handle),
-                                     download_manager));
+                                     download_manager,
+                                     ""));

[Randy Smith (Not in Mondays), 2011/11/16 21:40:25]

I'm finding myself a bit uncomfortable about the interchangeability of "" and an
empty hash.  Is there an answer to the question of "What's the hash of a zero
length file?"  If so, I'd suggest initializing new DownloadFiles with that
value, using it most places, and using "" to mean "not collecting hash--sorry". 
How hard would that be to do?

[ahendrickson, 2011/11/19 20:18:04]

We're now using Pickle's instead of strings.

   if (net::OK != download_file->Initialize(get_hash)) {
     request_handle.CancelRequest();
     return;
   }
 
   DCHECK(GetDownloadFile(info->download_id) == NULL);
   downloads_[info->download_id] = download_file.release();
 
   // The file is now ready, we can un-pause the request and start saving data.
   request_handle.ResumeRequest();
@@ skipping 26 matching lines @@
 }
 
 void DownloadFileManager::UpdateInProgressDownloads() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   for (DownloadFileMap::iterator i = downloads_.begin();
        i != downloads_.end(); ++i) {
     DownloadId global_id = i->first;
     DownloadFile* download_file = i->second;
     DownloadManager* manager = download_file->GetDownloadManager();
     if (manager) {
+      std::string partial_hash;
+      if (!download_file->GetSha256Hash(&partial_hash) ||
+          BaseFile::IsEmptySha256Hash(partial_hash)) {
+        partial_hash.clear();
+      }
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
           base::Bind(&DownloadManager::UpdateDownload, manager,
-                     global_id.local(), download_file->bytes_so_far()));
+                     global_id.local(), download_file->bytes_so_far(),
+                     partial_hash));
     }
   }
 }
 
 void DownloadFileManager::StartDownload(
     DownloadCreateInfo* info, const DownloadRequestHandle& request_handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(info);
 
   DownloadManager* manager = request_handle.GetDownloadManager();
@@ skipping 34 matching lines @@
     const int data_len = (*contents)[i].second;
     if (!had_error && download_file) {
       net::Error write_result =
           download_file->AppendDataToFile(data->data(), data_len);
       if (write_result != net::OK) {
         // Write failed: interrupt the download.
         DownloadManager* download_manager = download_file->GetDownloadManager();
         had_error = true;
 
         int64 bytes_downloaded = download_file->bytes_so_far();
+        std::string partial_hash;
+        if (!download_file->GetSha256Hash(&partial_hash) ||
+            BaseFile::IsEmptySha256Hash(partial_hash)) {
+          partial_hash.clear();
+        }
+
         // Calling this here in case we get more data, to avoid
         // processing data after an error.  That could lead to
         // files that are corrupted if the later processing succeeded.
         CancelDownload(global_id);
         download_file = NULL;  // Was deleted in |CancelDownload|.
 
         if (download_manager) {
           BrowserThread::PostTask(
               BrowserThread::UI, FROM_HERE,
               base::Bind(&DownloadManager::OnDownloadInterrupted,
-                         download_manager, global_id.local(), bytes_downloaded,
+                         download_manager,
+                         global_id.local(),
+                         bytes_downloaded,
+                         partial_hash,
                          ConvertNetErrorToInterruptReason(
-                             write_result, DOWNLOAD_INTERRUPT_FROM_DISK)));
+                             write_result,
+                             DOWNLOAD_INTERRUPT_FROM_DISK)));
         }
       }
     }
     data->Release();
   }
 }
 
 void DownloadFileManager::OnResponseCompleted(
     DownloadId global_id,
     InterruptReason reason,
     const std::string& security_info) {
   VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id
            << " reason = " << InterruptReasonDebugString(reason)
            << " security_info = \"" << security_info << "\"";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DownloadFile* download_file = GetDownloadFile(global_id);
   if (!download_file)
     return;
 
   download_file->Finish();
 
   DownloadManager* download_manager = download_file->GetDownloadManager();
   if (!download_manager) {
     CancelDownload(global_id);
     return;
   }
 
-  std::string hash;
-  if (!download_file->GetSha256Hash(&hash) || BaseFile::IsEmptySha256Hash(hash))
-    hash.clear();
+  if (reason == DOWNLOAD_INTERRUPT_REASON_NONE) {
+    std::string hash;
+    if (!download_file->GetSha256Hash(&hash) ||
+        BaseFile::IsEmptySha256Hash(hash)) {
+      hash.clear();
+    }
 
-  if (reason == DOWNLOAD_INTERRUPT_REASON_NONE) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DownloadManager::OnResponseCompleted,
                    download_manager, global_id.local(),
                    download_file->bytes_so_far(), hash));
   } else {
+    std::string partial_hash;
+    if (!download_file->GetSha256Hash(&partial_hash) ||
+        BaseFile::IsEmptySha256Hash(partial_hash)) {
+      partial_hash.clear();

[Randy Smith (Not in Mondays), 2011/11/16 21:40:25]

Why duplicate this code?  Can it be hoisted out of the conditional?

[ahendrickson, 2011/11/19 20:18:04]

One is now a Pickle, but the other is a string.

+    }
+
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DownloadManager::OnDownloadInterrupted,
-                   download_manager, global_id.local(),
-                   download_file->bytes_so_far(), reason));
+                   download_manager,
+                   global_id.local(),
+                   download_file->bytes_so_far(),
+                   partial_hash,
+                   reason));
   }
   // We need to keep the download around until the UI thread has finalized
   // the name.
 }
 
 // This method will be sent via a user action, or shutdown on the UI thread, and
 // run on the download thread. Since this message has been sent from the UI
 // thread, the download may have already completed and won't exist in our map.
 void DownloadFileManager::CancelDownload(DownloadId global_id) {
   VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id;
@@ skipping 153 matching lines @@
 
   DownloadManager* download_manager = download_file->GetDownloadManager();
   if (!download_manager) {
     // Without a download manager, we can't cancel the request normally, so we
     // need to do it here.  The normal path will also update the download
     // history before canceling the request.
     download_file->CancelDownloadRequest();
     return;
   }
 
+  std::string partial_hash;
+  if (!download_file->GetSha256Hash(&partial_hash) ||
+      BaseFile::IsEmptySha256Hash(partial_hash)) {
+    partial_hash.clear();
+  }
+
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DownloadManager::OnDownloadInterrupted,
-                 download_manager, global_id.local(),
+                 download_manager,
+                 global_id.local(),
                  download_file->bytes_so_far(),
+                 partial_hash,
                  ConvertNetErrorToInterruptReason(
-                     rename_error, DOWNLOAD_INTERRUPT_FROM_DISK)));
+                     rename_error,
+                     DOWNLOAD_INTERRUPT_FROM_DISK)));
 }
 
 void DownloadFileManager::EraseDownload(DownloadId global_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!ContainsKey(downloads_, global_id))
     return;
 
   DownloadFile* download_file = downloads_[global_id];
 
   VLOG(20) << " " << __FUNCTION__ << "()"
            << " id = " << global_id
            << " download_file = " << download_file->DebugString();
 
   downloads_.erase(global_id);
 
   delete download_file;
 
   if (downloads_.empty())
     StopUpdateTimer();
 }