Cleanup HistoryBackend and ExpireHistoryBackend interface

chrome/browser/history/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_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 34 matching lines @@
 
 namespace history {
 #if defined(OS_ANDROID)
 class AndroidProviderBackend;
 #endif
 
 class CommitLaterTask;
 struct DownloadRow;
 class HistoryBackendObserver;
 class HistoryClient;
+struct HistoryDetails;
 class HistoryDBTask;
 class InMemoryHistoryBackend;
 class TypedUrlSyncableService;
 class VisitFilter;
 
 // The maximum number of icons URLs per page which can be stored in the
 // thumbnail database.
 static const size_t kMaxFaviconsPerPage = 8;
 
 // The maximum number of bitmaps for a single icon URL which can be stored in
@@ skipping 27 matching lines @@
 // Internal history implementation which does most of the work of the history
 // system. This runs on a background thread (to not block the browser when we
 // do expensive operations) and is NOT threadsafe, so it must only be called
 // from message handlers on the background thread. Invoking on another thread
 // requires threadsafe refcounting.
 //
 // Most functions here are just the implementations of the corresponding
 // functions in the history service. These functions are not documented
 // here, see the history service for behavior.
 class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
-                       public BroadcastNotificationDelegate {
+                       public ExpireHistoryBackendDelegate {
  public:
   // Interface implemented by the owner of the HistoryBackend object. Normally,
   // the history service implements this to send stuff back to the main thread.
   // The unit tests can provide a different implementation if they don't have
   // a history service object.
   class Delegate {
    public:
     virtual ~Delegate() {}
 
     // Called when the database cannot be read correctly for some reason.
@@ skipping 675 matching lines @@
   // redirects.
   void SendFaviconChangedNotificationForPageAndRedirects(
       const GURL& page_url);
 
   // Generic stuff -------------------------------------------------------------
 
   // Processes the next scheduled HistoryDBTask, scheduling this method
   // to be invoked again if there are more tasks that need to run.
   void ProcessDBTaskImpl();
 
-  void BroadcastNotifications(int type,
-                              scoped_ptr<HistoryDetails> details) override;
-  void NotifySyncURLsModified(URLRows* rows) override;
-  void NotifySyncURLsDeleted(bool all_history,
-                             bool expired,
-                             URLRows* rows) override;
+  // Broadcasts the specified notification to the notification service on both
+  // the main thread and the history thread if a notification service is
+  // running.
+  void BroadcastNotifications(int type, scoped_ptr<HistoryDetails> details);
+
+  // ExpireHistoryBackendDelegate:
+  void NotifyURLsModified(const URLRows& rows) override;
+  void NotifyURLsDeleted(bool all_history,
+                         bool expired,
+                         const URLRows& rows,
+                         const std::set<GURL>& favicon_urls) override;
 
   // Deleting all history ------------------------------------------------------
 
   // Deletes all history. This is a special case of deleting that is separated
   // from our normal dependency-following method for performance reasons. The
   // logic lives here instead of ExpireHistoryBackend since it will cause
   // re-initialization of some databases (e.g. Thumbnails) that could fail.
   // When these databases are not valid, our pointers must be NULL, so we need
   // to handle this type of operation to keep the pointers in sync.
   void DeleteAllHistory();
@@ skipping 105 matching lines @@
 
   // List of observers
   ObserverList<HistoryBackendObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_