Make DownloadHistory observe manager, items

content/browser/download/download_item_impl.h

Index: content/browser/download/download_item_impl.h
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h
index efd3ca2ef349c9a4dd3234bfeda253c4b6a78576..e044771181cd69783c14a1933237daf9f434bb4c 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h
@@ -36,7 +36,15 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // |bound_net_log| is constructed externally for our use.
   DownloadItemImpl(DownloadItemImplDelegate* delegate,
                    content::DownloadId download_id,
-                   const content::DownloadPersistentStoreInfo& info,
+                   const FilePath& path,
+                   const GURL& url,
+                   const GURL& referrer_url,
+                   const base::Time& start_time,
+                   const base::Time& end_time,
+                   int64 received_bytes,
+                   int64 total_bytes,
+                   DownloadItem::DownloadState state,
+                   bool opened,
                    const net::BoundNetLog& bound_net_log);
 
   // Constructing for a regular download.
@@ -73,12 +81,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // Indicate that an error has occurred on the download.
   virtual void Interrupt(content::DownloadInterruptReason reason);
 
-  // Mark the item as having been persisted.
-  virtual void SetIsPersisted();
-
-  // Set the item's DB handle.
-  virtual void SetDbHandle(int64 handle);
-
   // Cancels the off-thread aspects of the download.
   // TODO(rdsmith): This should be private and only called from
   // DownloadItem::Cancel/Interrupt; it isn't now because we can't
@@ -165,8 +167,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   virtual content::DownloadId GetGlobalId() const OVERRIDE;
   virtual base::Time GetStartTime() const OVERRIDE;
   virtual base::Time GetEndTime() const OVERRIDE;
-  virtual bool IsPersisted() const OVERRIDE;
-  virtual int64 GetDbHandle() const OVERRIDE;
   virtual bool IsPaused() const OVERRIDE;
   virtual bool GetOpenWhenComplete() const OVERRIDE;
   virtual void SetOpenWhenComplete(bool open) OVERRIDE;
@@ -186,8 +186,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   virtual const std::string& GetLastModifiedTime() const OVERRIDE;
   virtual const std::string& GetETag() const OVERRIDE;
   virtual content::DownloadInterruptReason GetLastReason() const OVERRIDE;
-  virtual content::DownloadPersistentStoreInfo
-      GetPersistentStoreInfo() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
   virtual FilePath GetFileNameToReportUser() const OVERRIDE;
@@ -354,9 +352,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // Time the download completed.
   base::Time end_time_;
 
-  // Our persistent store handle.
-  int64 db_handle_;
-
   // Our delegate.
   DownloadItemImplDelegate* delegate_;
 
@@ -378,8 +373,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // before the observer is added.
   bool auto_opened_;
 
-  bool is_persisted_;
-
   // True if the item was downloaded temporarily.
   bool is_temporary_;