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 5c5a0c348bf567b514530c5213fdc52cf23e3f34..e461aad277ceb1fecdab8a22c940c6aaddedeb9b 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.
@@ -70,12 +78,10 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   virtual void ShowDownloadInShell() OVERRIDE;
   virtual int32 GetId() const OVERRIDE;
   virtual content::DownloadId GetGlobalId() const OVERRIDE;
-  virtual int64 GetDbHandle() const OVERRIDE;
   virtual DownloadState GetState() const OVERRIDE;
   virtual content::DownloadInterruptReason GetLastReason() const OVERRIDE;
   virtual bool IsPaused() const OVERRIDE;
   virtual bool IsTemporary() const OVERRIDE;
-  virtual bool IsPersisted() const OVERRIDE;
   virtual bool IsPartialDownload() const OVERRIDE;
   virtual bool IsInProgress() const OVERRIDE;
   virtual bool IsCancelled() const OVERRIDE;
@@ -123,8 +129,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   virtual bool GetAutoOpened() OVERRIDE;
   virtual bool GetOpened() const OVERRIDE;
   virtual bool MatchesQuery(const string16& query) const OVERRIDE;
-  virtual content::DownloadPersistentStoreInfo
-      GetPersistentStoreInfo() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
   virtual void DelayedDownloadOpened(bool auto_opened) OVERRIDE;
@@ -202,12 +206,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // should be considered complete.
   virtual void MarkAsComplete();
 
-  // Interactions with persistence system --------------------------------------
-
-  // TODO(benjhayden): Remove when DownloadHistory becomes an observer.
-  virtual void SetIsPersisted();
-  virtual void SetDbHandle(int64 handle);
-
  private:
   // Normal progression of a download ------------------------------------------
 
@@ -369,9 +367,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_;
 
@@ -393,8 +388,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_;