Make DownloadHistory observe manager, items

content/public/browser/download_item.h

Index: content/public/browser/download_item.h
diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h
index 5acd89d370bb2ff9e005854b35d0a7baa8528338..80a10c3da06774425d5dda3f9b076fa227563c02 100644
--- a/content/public/browser/download_item.h
+++ b/content/public/browser/download_item.h
@@ -43,7 +43,6 @@ class BrowserContext;
 class DownloadId;
 class DownloadManager;
 class WebContents;
-struct DownloadPersistentStoreInfo;
 
 // One DownloadItem per download. This is the model class that stores all the
 // state for a download. Multiple views, such as a tab's download shelf and the
@@ -89,10 +88,6 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData {
                                   // TARGET_DISPOSITION_OVERWRITE.
   };
 
-  // A fake download table ID which represents a download that has started,
-  // but is not yet in the table.
-  static const int kUninitializedHandle;
-
   static const char kEmptyFileHash[];
 
   // Interface that observers of a particular download must implement in order
@@ -157,7 +152,6 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData {
 
   virtual int32 GetId() const = 0;
   virtual DownloadId GetGlobalId() const = 0;
-  virtual int64 GetDbHandle() const = 0;
   virtual DownloadState GetState() const = 0;
 
   // Only valid if |GetState() == DownloadItem::INTERRUPTED|.
@@ -165,7 +159,6 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData {
 
   virtual bool IsPaused() const = 0;
   virtual bool IsTemporary() const = 0;
-  virtual bool IsPersisted() const = 0;
 
   //    Convenience routines for accessing GetState() results conceptually -----
 
@@ -303,7 +296,6 @@ class CONTENT_EXPORT DownloadItem : public base::SupportsUserData {
   // Returns true if this item matches |query|. |query| must be lower-cased.
   virtual bool MatchesQuery(const string16& query) const = 0;
 
-  virtual DownloadPersistentStoreInfo GetPersistentStoreInfo() const = 0;
   virtual BrowserContext* GetBrowserContext() const = 0;
   virtual WebContents* GetWebContents() const = 0;