Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/history/history_service.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_SERVICE_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 35 matching lines @@
 class PageUsageRequest;
 class Profile;
 struct ImportedFaviconUsage;
 class SkBitmap;
 
 namespace base {
 class FilePath;
 class Thread;
 }
 
+namespace extensions {
+class HistoryEventRouter;
+}
+
 namespace safe_browsing {
 class LastDownloadFinder;
 }
 
 namespace visitedlink {
 class VisitedLinkMaster;
 }
 
 namespace history {
 
@@ skipping 14 matching lines @@
 struct HistoryDetails;
 struct KeywordSearchTermVisit;
 
 }  // namespace history
 
 // 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.
-class HistoryService : public content::NotificationObserver,
-                       public syncer::SyncableService,
+class HistoryService : public syncer::SyncableService,
                        public KeyedService,
                        public visitedlink::VisitedLinkDelegate {
  public:
   // Miscellaneous commonly-used types.
   typedef std::vector<PageUsageData*> PageUsageDataList;
 
   // Must call Init after construction. The |history::HistoryClient| object
   // must be valid for the whole lifetime of |HistoryService|.
   explicit HistoryService(history::HistoryClient* client, Profile* profile);
   // The empty constructor is provided only for testing.
@@ skipping 424 matching lines @@
     PRIORITY_LOW,     // Low priority things like indexing or expiration.
   };
 
  private:
   class BackendDelegate;
 #if defined(OS_ANDROID)
   friend class AndroidHistoryProviderService;
 #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;
   friend class HistoryOperation;
   friend class HistoryQuickProviderTest;
   friend class history::HistoryTest;
   friend class HistoryURLProvider;
   friend class HistoryURLProviderTest;
   friend class history::InMemoryURLIndexTest;
   template<typename Info, typename Callback> friend class DownloadRequest;
   friend class safe_browsing::LastDownloadFinder;
   friend class PageUsageRequest;
   friend class RedirectRequest;
   friend class SyncBookmarkDataTypeControllerTest;
   friend class TestingProfile;
 
   // Called on shutdown, this will tell the history backend to complete and
   // will release pointers to it. No other functions should be called once
   // cleanup has happened that may dispatch to the history thread (because it
   // will be NULL).
   //
   // In practice, this will be called by the service manager (BrowserProcess)
   // when it is being destroyed. Because that reference is being destroyed, it
   // should be impossible for anybody else to call the service, even if it is
   // 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;
 
   // Low-level Init().  Same as the public version, but adds a |no_db| parameter
   // that is only set by unittests which causes the backend to not init its DB.
   bool Init(const base::FilePath& history_dir, bool no_db);
 
   // Called by the HistoryURLProvider class to schedule an autocomplete, it
   // will be called back on the internal history thread with the history
   // database so it can query. See history_autocomplete.cc for a diagram.
@@ skipping 28 matching lines @@
   // |redirects| is an empty vector.
   void NotifyURLVisited(ui::PageTransition transition,
                         const history::URLRow& row,
                         const history::RedirectList& redirects,
                         base::Time visit_time);
 
   // Notify all HistoryServiceObservers registered that URLs have been added or
   // 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 -------------------------------------------------------------------
 
   // These favicon methods are exposed to the FaviconService. Instead of calling
   // these methods directly you should call the respective method on the
   // FaviconService.
 
   // Used by FaviconService to get the favicon bitmaps from the history backend
   // whose edge sizes most closely match |desired_sizes| for |icon_types|. If
@@ skipping 225 matching lines @@
     DCHECK(thread_checker_.CalledOnValidThread());
     ScheduleTask(priority, base::Bind(func, history_backend_.get(),
                                       a, b, c, d, e));
   }
 
   // TODO(sdefresne): http://crbug.com/430070 remove this method.
   Profile* profile() { return profile_; }
 
   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_;
 
   // This class has most of the implementation and runs on the 'thread_'.
   // You MUST communicate with this class ONLY through the thread_'s
   // message_loop().
   //
   // This pointer will be NULL once Cleanup() has been called, meaning no
   // more calls should be made to the history thread.
@@ skipping 35 matching lines @@
 
   history::DeleteDirectiveHandler delete_directive_handler_;
 
   // All vended weak pointers are invalidated in Cleanup().
   base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_