Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/history/history_service.h

Index: chrome/browser/history/history_service.h
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 267e82eca125117bed54288e60f4107a4ecb70e3..1cdb918f7700d2be1cb786a6cf9d6719ab952bd0 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -53,6 +53,10 @@ class FilePath;
 class Thread;
 }
 
+namespace extensions {
+class HistoryEventRouter;
+}
+
 namespace safe_browsing {
 class LastDownloadFinder;
 }
@@ -87,8 +91,7 @@ struct KeywordSearchTermVisit;
 //
 // This service is thread safe. Each request callback is invoked in the
 // thread that made the request.
-class HistoryService : public content::NotificationObserver,
-                       public syncer::SyncableService,
+class HistoryService : public syncer::SyncableService,
                        public KeyedService,
                        public visitedlink::VisitedLinkDelegate {
  public:
@@ -533,6 +536,7 @@ class HistoryService : public content::NotificationObserver,
 #endif
   friend class base::RefCountedThreadSafe<HistoryService>;
   friend class BackendDelegate;
+  friend class extensions::HistoryEventRouter;

[sdefresne, 2014/12/04 17:21:13]

Please remove, we do not want a dependency (even if just a friend).

[nshaik, 2014/12/07 09:34:50]

Done.

   friend class FaviconService;
   friend class history::HistoryBackend;
   friend class history::HistoryQueryTest;
@@ -560,11 +564,6 @@ class HistoryService : public content::NotificationObserver,
   // still in memory (pending requests may be holding a reference to us).
   void Cleanup();
 
-  // Implementation of content::NotificationObserver.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   // Implementation of visitedlink::VisitedLinkDelegate.
   void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
 
@@ -613,11 +612,16 @@ class HistoryService : public content::NotificationObserver,
   // modified. |changed_urls| contains the list of affects URLs.
   void NotifyURLsModified(const history::URLRows& changed_urls);
 
+  // Notify all HistoryServiceObservers registered that URLs have been deleted.
+  // |deleted_details| contains the list of deleted URLs.
+  void NotifyURLsDeleted(const history::URLsDeletedDetails& deleted_details);

[sdefresne, 2014/12/04 17:21:13]

I'd like to also remove URLsDeletedDetails by declaring the method like this:

void NotifyURLsDeleted(bool all_history,
                       bool expired,
                       const URLRows& rows) = 0;

[nshaik, 2014/12/07 09:34:50]

Done.

+
   // Notify all HistoryServiceObservers registered that the
   // HistoryService has finished loading.
   void NotifyHistoryServiceLoaded();
 
-  // HistoryService is being deleted.
+  // Notify all HistoryServiceObservers regigstered that HistoryService is being

[sdefresne, 2014/12/04 17:21:13]

nit: registered

[nshaik, 2014/12/07 09:34:50]

Done.

+  // deleted.
   void NotifyHistoryServiceBeingDeleted();
 
   // Favicon -------------------------------------------------------------------
@@ -863,8 +867,6 @@ class HistoryService : public content::NotificationObserver,
 
   base::ThreadChecker thread_checker_;
 
-  content::NotificationRegistrar registrar_;
-
   // The thread used by the history service to run complicated operations.
   // |thread_| is NULL once |Cleanup| is NULL.
   base::Thread* thread_;