Added member data to classes to support download resumption.

content/browser/download/download_persistent_store_info.h

 // 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.
 //
 // Download struct used for informing and querying the download system's
 // persitent store.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_PERSISTENT_STORE_INFO_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_PERSISTENT_STORE_INFO_H_
 #pragma once
 
+#include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/time.h"
+#include "content/browser/download/interrupt_reasons.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 
 class DownloadItem;
 
 // Contains the information that is stored in the download system's persistent
 // store (or refers to it).  Managed by the DownloadItem.  When used to create a
 // history entry, all fields except for |db_handle| are set by DownloadItem and
 // read by DownloadDatabase.  When used to update a history entry, DownloadItem
 // sets all fields, but DownloadDatabase only reads |end_time|,
 // |received_bytes|, |state|, and |opened|, and uses |db_handle| to select the
 // row in the database table to update.  When used to load DownloadItems from
 // the history, all fields except |referrer_url| are set by the DownloadDatabase
 // and read by the DownloadItem.
 struct CONTENT_EXPORT DownloadPersistentStoreInfo {
-  // TODO(ahendrickson) -- Reduce the number of constructors.
   DownloadPersistentStoreInfo();
   DownloadPersistentStoreInfo(const FilePath& path,
+                              const FilePath& target,
                               const GURL& url,
                               const GURL& referrer,
                               const base::Time& start,
                               const base::Time& end,
                               int64 received,
                               int64 total,
                               int32 download_state,
                               int64 handle,
-                              bool download_opened);
+                              bool download_opened,
+                              const std::string& hash_state_pickle,

[Randy Smith (Not in Mondays), 2011/11/22 17:37:49]

nit: I'd like to use consistent vocabulary for things throughout the code base,
so I'm inclined to think this should be just "hash_state".

[ahendrickson, 2011/11/22 23:46:44]

Done.

+                              const std::string& last_modified,
+                              const std::string& etag,
+                              InterruptReason reason);
   ~DownloadPersistentStoreInfo();  // For linux-clang.
 
-  // The final path where the download is saved.
+  // The file name that we are currently using.
   FilePath path;
 
+  // The final path where the download will be saved.
+  FilePath target_name;
+
   // The URL from which we are downloading. This is the final URL after any
   // redirection by the server for |url_chain|. Is not changed by UpdateEntry().
   GURL url;
 
   // The URL that referred us.
   GURL referrer_url;
 
   // The time when the download started. Is not changed by UpdateEntry().
   base::Time start_time;
 
   // The time when the download completed.
   base::Time end_time;
 
   // The number of bytes received (so far).
   int64 received_bytes;
 
   // The total number of bytes in the download. Is not changed by UpdateEntry().
   int64 total_bytes;
 
   // The current state of the download.
   int32 state;
 
   // The handle of the download in the database. Is not changed by
   // UpdateEntry().
   int64 db_handle;
 
   // Whether this download has ever been opened from the browser.
   bool opened;
+
+  // The state of the Sha256 hash of the content.
+  std::string hash_state;
+
+  // Server's time stamp for the file.
+  std::string last_modified_time;
+
+  // Server's ETAG for the file.
+  std::string etag;
+
+  // The reason that the download was interrupted (if it was).
+  InterruptReason last_reason;
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_PERSISTENT_STORE_INFO_H_