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 1b4a33434550b7ad91f83c256681026ffe7dc835..a88fa4c082283d8f6f6017c8909206add3197a02 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h
@@ -75,12 +75,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
@@ -115,6 +109,9 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // Called by SavePackage to set the total number of bytes on the item.
   virtual void SetTotalBytes(int64 total_bytes);
 
+  // Notify observers that this item is being removed by the user.
+  virtual void NotifyRemoved();
+
   // Overridden from DownloadItem.
   virtual void AddObserver(DownloadItem::Observer* observer) OVERRIDE;
   virtual void RemoveObserver(DownloadItem::Observer* observer) OVERRIDE;
@@ -164,8 +161,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 +181,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;
@@ -195,9 +188,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   virtual FilePath GetUserVerifiedFilePath() const OVERRIDE;
   virtual std::string DebugString(bool verbose) const OVERRIDE;
   virtual void MockDownloadOpenForTesting() OVERRIDE;
-  virtual ExternalData* GetExternalData(const void* key) OVERRIDE;
-  virtual const ExternalData* GetExternalData(const void* key) const OVERRIDE;
-  virtual void SetExternalData(const void* key, ExternalData* data) OVERRIDE;
 
  private:
   // Construction common to all constructors. |active| should be true for new
@@ -357,9 +347,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_;
 
@@ -381,8 +368,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // before the observer is added.
   bool auto_opened_;
 
-  bool is_persisted_;
-
   // True if the download was initiated in an incognito window.
   bool is_otr_;
 
@@ -404,10 +389,6 @@ class CONTENT_EXPORT DownloadItemImpl : public content::DownloadItem {
   // Did the delegate delay calling Complete on this download?
   bool delegate_delayed_complete_;
 
-  // External Data storage.  All objects in the store
-  // are owned by the DownloadItemImpl.
-  std::map<const void*, ExternalData*> external_data_map_;
-
   // Net log to use for this download.
   const net::BoundNetLog bound_net_log_;