Cleanup HistoryBackend and ExpireHistoryBackend interface

chrome/browser/history/expire_history_backend.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_EXPIRE_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_
 
 #include <queue>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "components/history/core/browser/history_types.h"
 
 class GURL;
 class TestingProfile;
 
 namespace history {
 
 class HistoryClient;
 class HistoryDatabase;
-struct HistoryDetails;
 class ThumbnailDatabase;
 
 // Delegate used to broadcast notifications to the main thread.
-class BroadcastNotificationDelegate {
+class ExpireHistoryBackendDelegate {
  public:
-  // Schedules a broadcast of the given notification on the application main
-  // thread.
-  virtual void BroadcastNotifications(int type,
-                                      scoped_ptr<HistoryDetails> details) = 0;
-
   // Tells typed url sync code to handle URL modifications or deletions.
-  virtual void NotifySyncURLsModified(URLRows* rows) = 0;
-  virtual void NotifySyncURLsDeleted(bool all_history,
-                                     bool expired,
-                                     URLRows* rows) = 0;
+  virtual void NotifyURLsModified(const URLRows& rows) = 0;
+  virtual void NotifyURLsDeleted(bool all_history,
+                                 bool expired,
+                                 const URLRows& rows,
+                                 const std::set<GURL>& favicon_urls) = 0;
 
  protected:
-  virtual ~BroadcastNotificationDelegate() {}
+  virtual ~ExpireHistoryBackendDelegate() {}
 };
 
 // Encapsulates visit expiration criteria and type of visits to expire.
 class ExpiringVisitsReader {
  public:
   virtual ~ExpiringVisitsReader() {}
   // Populates |visits| from |db|, using provided |end_time| and |max_visits|
   // cap.
   virtual bool Read(base::Time end_time, HistoryDatabase* db,
                     VisitVector* visits, int max_visits) const = 0;
 };
 
 typedef std::vector<const ExpiringVisitsReader*> ExpiringVisitsReaders;
 
 // Helper component to HistoryBackend that manages expiration and deleting of
 // history.
 //
 // It will automatically start periodically expiring old history once you call
 // StartExpiringOldStuff().
 class ExpireHistoryBackend {
  public:
   // The delegate pointer must be non-NULL. We will NOT take ownership of it.
   // HistoryClient may be NULL. The HistoryClient is used when expiring URLS so
   // that we don't remove any URLs or favicons that are bookmarked (visits are
   // removed though).
-  ExpireHistoryBackend(BroadcastNotificationDelegate* delegate,
+  ExpireHistoryBackend(ExpireHistoryBackendDelegate* delegate,
                        HistoryClient* history_client);
   ~ExpireHistoryBackend();
 
   // Completes initialization by setting the databases that this class will use.
   void SetDatabases(HistoryDatabase* main_db,
                     ThumbnailDatabase* thumb_db);
 
   // Begins periodic expiration of history older than the given threshold. This
   // will continue until the object is deleted.
   void StartExpiringOldStuff(base::TimeDelta expiration_threshold);
@@ skipping 159 matching lines @@
 
   // Returns the reader for all visits. This method is only used by the unit
   // tests.
   const ExpiringVisitsReader* GetAllVisitsReader();
 
   // Returns the reader for AUTO_SUBFRAME visits. This method is only used by
   // the unit tests.
   const ExpiringVisitsReader* GetAutoSubframeVisitsReader();
 
   // Non-owning pointer to the notification delegate (guaranteed non-NULL).
-  BroadcastNotificationDelegate* delegate_;
+  ExpireHistoryBackendDelegate* delegate_;
 
   // Non-owning pointers to the databases we deal with (MAY BE NULL).
   HistoryDatabase* main_db_;       // Main history database.
   ThumbnailDatabase* thumb_db_;    // Thumbnails and favicons.
 
   // The threshold for "old" history where we will automatically delete it.
   base::TimeDelta expiration_threshold_;
 
   // List of all distinct types of readers. This list is used to populate the
   // work queue.
@@ skipping 19 matching lines @@
   // Used to generate runnable methods to do timers on this class. They will be
   // automatically canceled when this class is deleted.
   base::WeakPtrFactory<ExpireHistoryBackend> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExpireHistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_EXPIRE_HISTORY_BACKEND_H_