Make DownloadHistory observe manager, items

chrome/browser/history/history.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 CHROME_BROWSER_HISTORY_HISTORY_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 16 matching lines @@
 #include "sql/init_status.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #endif
 
 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;
 class InMemoryURLIndex;
 class InMemoryURLIndexTest;
 class HistoryAddPageArgs;
 class HistoryBackend;
 class HistoryDatabase;
 struct HistoryDetails;
 class HistoryQueryTest;
@@ skipping 26 matching lines @@
  protected:
   friend class base::RefCountedThreadSafe<HistoryDBTask>;
 
   virtual ~HistoryDBTask() {}
 };
 
 // The history service records page titles, and visit times, as well as
 // (eventually) information about autocomplete.
 //
 // This service is thread safe. Each request callback is invoked in the
 // thread that made the request.

[Randy Smith (Not in Mondays), 2012/08/27 19:28:19]

I'd modify this comment to say "Each request callback that makes use of the
CancelableRequestConsumer interface is invoked on the thread that made the
request."

[benjhayden, 2012/09/10 19:02:56]

Done.

 class HistoryService : public CancelableRequestProvider,
                        public content::NotificationObserver,
                        public RefcountedProfileKeyedService {
  public:
   // Miscellaneous commonly-used types.
   typedef std::vector<PageUsageData*> PageUsageDataList;
 
   // Must call Init after construction.
   explicit HistoryService(Profile* profile);
   // The empty constructor is provided only for testing.
@@ skipping 326 matching lines @@
   // removed.
   void ExpireHistoryBetween(const std::set<GURL>& restrict_urls,
                             base::Time begin_time, base::Time end_time,
                             CancelableRequestConsumerBase* consumer,
                             const base::Closure& callback);
 
   // Downloads -----------------------------------------------------------------
 
   // Implemented by the caller of 'CreateDownload' below, and is called when the
   // history service has created a new entry for a download in the history db.
-  typedef base::Callback<void(int32, int64)> DownloadCreateCallback;
+  typedef base::Callback<void(int64)> DownloadCreateCallback;
 
   // Begins a history request to create a new persistent entry for a download.
   // '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,
-                        CancelableRequestConsumerBase* consumer,
-                        const DownloadCreateCallback& callback);
+  void CreateDownload(const DownloadPersistentStoreInfo& info,
+                      const DownloadCreateCallback& callback);
+
+  typedef base::Callback<
+      void(bool,        // Were we able to determine the # of visits?
+           int,         // Number of visits.
+           base::Time)> // Time of first visit. Only set if bool
+                        // is true and int is > 0.
+      GetVisibleVisitCountToHostSimpleCallback;
+  void GetVisibleVisitCountToHostSimple(
+      const GURL& url,
+      const GetVisibleVisitCountToHostSimpleCallback& callback);
 
   // Implemented by the caller of 'GetNextDownloadId' below.
   typedef base::Callback<void(int)> DownloadNextIdCallback;
 
   // Runs the callback with the next available download id.
   Handle GetNextDownloadId(CancelableRequestConsumerBase* consumer,
                            const DownloadNextIdCallback& callback);
 
   // 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>*)>
+      scoped_ptr<std::vector<DownloadPersistentStoreInfo> >)>
           DownloadQueryCallback;
 
   // Begins a history request to retrieve the state of all downloads in the
   // history db. 'callback' runs when the history service request is complete,
   // at which point 'info' contains an array of DownloadPersistentStoreInfo, one
   // per download.
-  Handle QueryDownloads(CancelableRequestConsumerBase* consumer,
-                        const DownloadQueryCallback& callback);
+  void QueryDownloads(const DownloadQueryCallback& callback);
 
   // Begins a request to clean up entries that has been corrupted (because of
   // the crash, for example).
   void CleanUpInProgressEntries();
 
   // 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);
+  void UpdateDownload(const 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);
+  // 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 ------------------------------------------------------------
 
   typedef base::Callback<void(Handle, std::vector<PageUsageData*>*)>
       SegmentQueryCallback;
 
   // Query usage data for all visit segments since the provided time.
   //
   // The request is performed asynchronously and can be cancelled by using the
   // returned handle.
@@ skipping 444 matching lines @@
   // The index used for quick history lookups.
   scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
 
   scoped_refptr<ObserverListThreadSafe<history::VisitDatabaseObserver> >
       visit_database_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_