Make DownloadHistory observe manager, items

content/browser/download/download_manager_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_
 
 #include <map>
 #include <set>
 
@@ skipping 56 matching lines @@
       int32 download_id,
       content::DownloadInterruptReason reason) OVERRIDE;
   virtual int RemoveDownloadsBetween(base::Time remove_begin,
                                      base::Time remove_end) OVERRIDE;
   virtual int RemoveDownloads(base::Time remove_begin) OVERRIDE;
   virtual int RemoveAllDownloads() OVERRIDE;
   virtual void DownloadUrl(
       scoped_ptr<content::DownloadUrlParameters> params) OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual void OnPersistentStoreQueryComplete(
-      std::vector<content::DownloadPersistentStoreInfo>* entries) OVERRIDE;
-  virtual void OnItemAddedToPersistentStore(int32 download_id,
-                                            int64 db_handle) OVERRIDE;
+  virtual content::DownloadItem* CreateDownloadItem(
+      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,
+      content::DownloadItem::DownloadState state,
+      bool opened) OVERRIDE;
   virtual int InProgressCount() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
   virtual void CheckForHistoryFilesRemoval() OVERRIDE;
   virtual content::DownloadItem* GetDownload(int id) OVERRIDE;
-  virtual void SavePageDownloadFinished(
-      content::DownloadItem* download) OVERRIDE;
 
  private:
   typedef std::set<content::DownloadItem*> DownloadSet;
   typedef base::hash_map<int32, DownloadItemImpl*> DownloadMap;
   typedef std::vector<DownloadItemImpl*> DownloadItemImplVector;
 
   // For testing.
   friend class DownloadManagerTest;
   friend class DownloadTest;
 
@@ skipping 32 matching lines @@
   // Does nothing if the download is not in the history DB.
   void RemoveFromActiveList(DownloadItemImpl* download);
 
   // Inform observers that the model has changed.
   void NotifyModelChanged();
 
   // Debugging routine to confirm relationship between below
   // containers; no-op if NDEBUG.
   void AssertContainersConsistent() const;
 
-  // Add a DownloadItem to history_downloads_.
-  void AddDownloadItemToHistory(DownloadItemImpl* item, int64 db_handle);
-
   // Remove from internal maps.
   int RemoveDownloadItems(const DownloadItemImplVector& pending_deletes);
 
   // Called in response to our request to the DownloadFileManager to
   // create a DownloadFile.  A |reason| of
   // content::DOWNLOAD_INTERRUPT_REASON_NONE indicates success.
   void OnDownloadFileCreated(
       int32 download_id, content::DownloadInterruptReason reason);
 
   // Called when the delegate has completed determining the download target.
   // Arguments following |download_id| are as per
   // content::DownloadTargetCallback.
   void OnDownloadTargetDetermined(
       int32 download_id,
       const FilePath& target_path,
       content::DownloadItem::TargetDisposition disposition,
       content::DownloadDangerType danger_type,
       const FilePath& intermediate_path);
 
-  // Called when a download entry is committed to the persistent store.
-  void OnDownloadItemAddedToPersistentStore(DownloadItemImpl* item);
-
-  // Called when Save Page As entry is committed to the persistent store.
-  void OnSavePageItemAddedToPersistentStore(DownloadItemImpl* item);
-
   // Overridden from DownloadItemImplDelegate
   // (Note that |GetBrowserContext| are present in both interfaces.)
   virtual DownloadFileManager* GetDownloadFileManager() OVERRIDE;
   virtual bool ShouldOpenDownload(DownloadItemImpl* item) OVERRIDE;
   virtual bool ShouldOpenFileBasedOnExtension(const FilePath& path) OVERRIDE;
   virtual void CheckForFileRemoval(DownloadItemImpl* download_item) OVERRIDE;
   virtual void MaybeCompleteDownload(DownloadItemImpl* download) OVERRIDE;
   virtual void DownloadStopped(DownloadItemImpl* download) OVERRIDE;
   virtual void DownloadCompleted(DownloadItemImpl* download) OVERRIDE;
   virtual void DownloadOpened(DownloadItemImpl* download) OVERRIDE;
   virtual void DownloadRemoved(DownloadItemImpl* download) OVERRIDE;
   virtual void DownloadRenamedToIntermediateName(
       DownloadItemImpl* download) OVERRIDE;
-  virtual void DownloadRenamedToFinalName(DownloadItemImpl* download) OVERRIDE;
   virtual void AssertStateConsistent(DownloadItemImpl* download) const OVERRIDE;
 
   // Factory for creation of downloads items.
   scoped_ptr<content::DownloadItemFactory> factory_;
 
   // |downloads_| is the owning set for all downloads known to the
   // DownloadManager.  This includes downloads started by the user in
   // this session, downloads initialized from the history system, and
   // "save page as" downloads.  All other DownloadItem containers in
   // the DownloadManager are maps; they do not own the DownloadItems.
@@ skipping 33 matching lines @@
 
   // Allows an embedder to control behavior. Guaranteed to outlive this object.
   content::DownloadManagerDelegate* delegate_;
 
   net::NetLog* net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerImpl);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_