Added member data to classes to support download resumption.

content/browser/download/download_item.cc

Index: content/browser/download/download_item.cc
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index e3eff9943cf34b37c35f0b76a1f26125076bdb2f..ad6765844c8722539b1a6fd48e5584a69b2c84c0 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -175,7 +175,9 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       referrer_charset_(info.referrer_charset),
       total_bytes_(info.total_bytes),
       received_bytes_(0),
-      last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE),
+      last_modified_time_(info.last_modified),
+      etag_(info.etag),
+      last_reason_(info.server_interrupt_reason),
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       start_time_(info.start_time),
@@ -187,7 +189,8 @@ DownloadItem::DownloadItem(DownloadManager* download_manager,
       safety_state_(SAFE),
       auto_opened_(false),
       is_otr_(is_otr),
-      is_temporary_(!info.save_info.file_path.empty()),
+      is_temporary_(!info.save_info.file_path.empty() &&
+                    !info.continued_download),
       all_data_saved_(false),
       opened_(false),
       open_enabled_(true),
@@ -332,10 +335,15 @@ void DownloadItem::UpdateSize(int64 bytes_so_far) {
     total_bytes_ = 0;
 }
 
+void DownloadItem::UpdateHash(const std::string& partial_hash) {
+  if (!partial_hash.empty() && !BaseFile::IsEmptySha256Hash(partial_hash))
+    hash_ = partial_hash;
+}
+
 // Updates from the download thread may have been posted while this download
 // was being cancelled in the UI thread, so we'll accept them unless we're
 // complete.
-void DownloadItem::Update(int64 bytes_so_far) {
+void DownloadItem::Update(int64 bytes_so_far, const std::string& partial_hash) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -344,6 +352,7 @@ void DownloadItem::Update(int64 bytes_so_far) {
     return;
   }
   UpdateSize(bytes_so_far);
+  UpdateHash(partial_hash);
   UpdateObservers();
 }
 
@@ -391,7 +400,7 @@ void DownloadItem::OnAllDataSaved(int64 size, const std::string& final_hash) {
   DCHECK(!all_data_saved_);
   all_data_saved_ = true;
   UpdateSize(size);
-  hash_ = final_hash;
+  UpdateHash(final_hash);
 }
 
 void DownloadItem::OnDownloadedFileRemoved() {
@@ -453,7 +462,9 @@ void DownloadItem::UpdateTarget() {
     state_info_.target_name = full_path_.BaseName();
 }
 
-void DownloadItem::Interrupted(int64 size, InterruptReason reason) {
+void DownloadItem::Interrupted(int64 size,
+                               const std::string partial_hash,
+                               InterruptReason reason) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -462,6 +473,7 @@ void DownloadItem::Interrupted(int64 size, InterruptReason reason) {
 
   last_reason_ = reason;
   UpdateSize(size);
+  UpdateHash(partial_hash);
   download_stats::RecordDownloadInterrupted(reason,
                                             received_bytes_,
                                             total_bytes_);
@@ -721,9 +733,8 @@ void DownloadItem::Init(bool active) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UpdateTarget();
-  if (active) {
+  if (active)
     download_stats::RecordDownloadCount(download_stats::START_COUNT);
-  }
   VLOG(20) << __FUNCTION__ << "() " << DebugString(true);
 }
 
@@ -784,6 +795,8 @@ std::string DownloadItem::DebugString(bool verbose) const {
         " is_paused = %c"
         " is_otr = %c"
         " safety_state = %s"
+        " last_modified = '%s'"
+        " etag = '%s'"
         " url_chain = \n\t\"%s\"\n\t"
         " target_name = \"%" PRFilePath "\""
         " full_path = \"%" PRFilePath "\"",
@@ -793,6 +806,8 @@ std::string DownloadItem::DebugString(bool verbose) const {
         is_paused() ? 'T' : 'F',
         is_otr() ? 'T' : 'F',
         DebugSafetyStateString(safety_state()),
+        last_modified_time_.c_str(),
+        etag_.c_str(),
         url_list.c_str(),
         state_info_.target_name.value().c_str(),
         full_path().value().c_str());