Added member data to classes to support download resumption.

content/browser/download/download_manager_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_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 275 matching lines @@
 
 void DownloadManagerImpl::OnFileRemovalDetected(int64 db_handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadMap::iterator it = history_downloads_.find(db_handle);
   if (it != history_downloads_.end()) {
     DownloadItem* download_item = it->second;
     download_item->OnDownloadedFileRemoved();
   }
 }
 
-void DownloadManagerImpl::RestartDownload(
-    int32 download_id) {
+void DownloadManagerImpl::RestartDownload(int32 download_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadItem* download = GetActiveDownloadItem(download_id);
   if (!download)
     return;
 
   VLOG(20) << __FUNCTION__ << "()"
            << " download = " << download->DebugString(true);
 
   FilePath suggested_path = download->GetSuggestedPath();
@@ skipping 106 matching lines @@
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&DownloadFileManager::RenameInProgressDownloadFile,
                  file_manager_, download->GetGlobalId(),
                  download_path));
 
   download->Rename(download_path);
 
   delegate_->AddItemToPersistentStore(download);
 }
 
-void DownloadManagerImpl::UpdateDownload(int32 download_id, int64 bytes_so_far,
-                                         int64 bytes_per_sec) {
+void DownloadManagerImpl::UpdateDownload(int32 download_id,
+                                         int64 bytes_so_far,
+                                         int64 bytes_per_sec,
+                                         std::string hash_state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadMap::iterator it = active_downloads_.find(download_id);
   if (it != active_downloads_.end()) {
     DownloadItem* download = it->second;
     if (download->IsInProgress()) {
-      download->UpdateProgress(bytes_so_far, bytes_per_sec);
+      download->UpdateProgress(bytes_so_far, bytes_per_sec, hash_state);
       UpdateDownloadProgress();  // Reflect size updates.
       delegate_->UpdateItemInPersistentStore(download);
     }
   }
 }
 
 void DownloadManagerImpl::OnResponseCompleted(int32 download_id,
                                               int64 size,
                                               const std::string& hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 172 matching lines @@
   // This function is called from the DownloadItem, so DI state
   // should already have been updated.
   AssertStateConsistent(download);
 
   if (file_manager_)
     download->OffThreadCancel(file_manager_);
 }
 
 void DownloadManagerImpl::OnDownloadInterrupted(int32 download_id,
                                                 int64 size,
+                                                std::string hash_state,
                                                 InterruptReason reason) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadItem* download = GetActiveDownload(download_id);
   if (!download)
     return;
 
   VLOG(20) << __FUNCTION__ << "()"
            << " reason " << InterruptReasonDebugString(reason)
            << " at offset " << download->GetReceivedBytes()
            << " size = " << size
            << " download = " << download->DebugString(true);
 
   RemoveFromActiveList(download);
-  download->Interrupted(size, reason);
+  download->Interrupted(size, hash_state, reason);
   download->OffThreadCancel(file_manager_);
 }
 
 DownloadItem* DownloadManagerImpl::GetActiveDownload(int32 download_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadMap::iterator it = active_downloads_.find(download_id);
   if (it == active_downloads_.end())
     return NULL;
 
   DownloadItem* download = it->second;
@@ skipping 112 matching lines @@
 }
 
 void DownloadManagerImpl::DownloadUrlToFile(const GURL& url,
                                             const GURL& referrer,
                                             const std::string& referrer_charset,
                                             const DownloadSaveInfo& save_info,
                                             TabContents* tab_contents) {
   DCHECK(tab_contents);
   ResourceDispatcherHost* resource_dispatcher_host =
       content::GetContentClient()->browser()->GetResourceDispatcherHost();
+
   // We send a pointer to content::ResourceContext, instead of the usual
   // reference, so that a copy of the object isn't made.
   // base::Bind can't handle 7 args, so we use URLParams and RenderParams.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload,
           URLParams(url, referrer), save_info, resource_dispatcher_host,
           RenderParams(tab_contents->GetRenderProcessHost()->GetID(),
                        tab_contents->GetRenderViewHost()->routing_id()),
           &tab_contents->browser_context()->GetResourceContext()));
@@ skipping 351 matching lines @@
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->GetOpened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }
 
 void DownloadManagerImpl::SetFileManager(DownloadFileManager* file_manager) {
   file_manager_ = file_manager;
 }