Make DownloadHistory observe manager, items

chrome/browser/history/history.h

Index: chrome/browser/history/history.h
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index 69fda8bc97b9ddd6773302bc72290e5b8c5eef6b..173034f5cdbc4f680adfc0f9a99683ad90462c3d 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -34,19 +34,17 @@ class BookmarkService;
 class FilePath;
 class GURL;
 class HistoryURLProvider;
-struct HistoryURLProviderParams;
 class PageUsageData;
 class PageUsageRequest;
 class Profile;
+struct DownloadPersistentStoreInfo;
+struct HistoryURLProviderParams;
 
 namespace base {
 class Thread;
 class Time;
 }
 
-namespace content {
-struct DownloadPersistentStoreInfo;
-}
 
 namespace history {
 class InMemoryHistoryBackend;
@@ -446,7 +444,7 @@ class HistoryService : public CancelableRequestProvider,
   // 'info' contains all the download's creation state, and 'callback' runs
   // when the history service request is complete.
   Handle CreateDownload(int32 id,
-                        const content::DownloadPersistentStoreInfo& info,
+                        const DownloadPersistentStoreInfo& info,
                         CancelableRequestConsumerBase* consumer,
                         const DownloadCreateCallback& callback);
 
@@ -460,7 +458,7 @@ class HistoryService : public CancelableRequestProvider,
   // Implemented by the caller of 'QueryDownloads' below, and is called when the
   // history service has retrieved a list of all download state. The call
   typedef base::Callback<void(
-      std::vector<content::DownloadPersistentStoreInfo>*)>
+      std::vector<DownloadPersistentStoreInfo>*)>
           DownloadQueryCallback;
 
   // Begins a history request to retrieve the state of all downloads in the
@@ -477,22 +475,11 @@ class HistoryService : public CancelableRequestProvider,
   // Called to update the history service about the current state of a download.
   // This is a 'fire and forget' query, so just pass the relevant state info to
   // the database with no need for a callback.
-  void UpdateDownload(const content::DownloadPersistentStoreInfo& data);
-
-  // Called to update the history service about the path of a download.
-  // This is a 'fire and forget' query.
-  void UpdateDownloadPath(const FilePath& path, int64 db_handle);
-
-  // Permanently remove a download from the history system. This is a 'fire and
-  // forget' operation.
-  void RemoveDownload(int64 db_handle);
-
-  // Permanently removes all completed download from the history system within
-  // the specified range. This function does not delete downloads that are in
-  // progress or in the process of being cancelled. This is a 'fire and forget'
-  // operation. You can pass is_null times to get unbounded time in either or
-  // both directions.
-  void RemoveDownloadsBetween(base::Time remove_begin, base::Time remove_end);
+  void UpdateDownload(const DownloadPersistentStoreInfo& data);
+
+  // Permanently remove a set of downloads from the history system. This is a
+  // 'fire and forget' operation.
+  void RemoveDownloads(const std::set<int64>& handles);
 
   // Visit Segments ------------------------------------------------------------