Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/ui/webui/history_ui.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_UI_WEBUI_HISTORY_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/web_history_service.h"
-#include "content/public/browser/notification_registrar.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 class BookmarkModel;
 class ProfileSyncService;
 class SupervisedUserService;
 
 // The handler for Javascript messages related to the "history" view.
 class BrowsingHistoryHandler : public content::WebUIMessageHandler,
-                               public content::NotificationObserver {
+                               public history::HistoryServiceObserver {
  public:
   // Represents a history entry to be shown to the user, representing either
   // a local or remote visit. A single entry can represent multiple visits,
   // since only the most recent visit on a particular day is shown.
   struct HistoryEntry {
     // Values indicating whether an entry represents only local visits, only
     // remote visits, or a mixture of both.
     enum EntryType {
       EMPTY_ENTRY = 0,
       LOCAL_ENTRY,
@@ skipping 61 matching lines @@
 
   // Handler for the "removeVisits" message.
   void HandleRemoveVisits(const base::ListValue* args);
 
   // Handler for "clearBrowsingData" message.
   void HandleClearBrowsingData(const base::ListValue* args);
 
   // Handler for "removeBookmark" message.
   void HandleRemoveBookmark(const base::ListValue* args);
 
-  // content::NotificationObserver implementation.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   // Merges duplicate entries from the query results, only retaining the most
   // recent visit to a URL on a particular day. That visit contains the
   // timestamps of the other visits.
   static void MergeDuplicateResults(
       std::vector<BrowsingHistoryHandler::HistoryEntry>* results);
 
  private:
   // The range for which to return results:
   // - ALLTIME: allows access to all the results in a paginated way.
   // - WEEK: the last 7 days.
@@ skipping 39 matching lines @@
 
   // Sets the query options for a week-wide query, |offset| weeks ago.
   void SetQueryTimeInWeeks(int offset, history::QueryOptions* options);
 
   // Sets the query options for a monthly query, |offset| months ago.
   void SetQueryTimeInMonths(int offset, history::QueryOptions* options);
 
   // kAcceptLanguages pref value.
   std::string GetAcceptLanguages() const;
 
-  content::NotificationRegistrar registrar_;
+  // history::HistoryServiceObserver:
+  void OnURLsDeleted(
+      HistoryService* history_service,
+      const history::URLsDeletedDetails& deleted_details) override;
 
   // Tracker for search requests to the history service.
   base::CancelableTaskTracker query_task_tracker_;
 
   // The currently-executing request for synced history results.
   // Deleting the request will cancel it.
   scoped_ptr<history::WebHistoryService::Request> web_history_request_;
 
   // True if there is a pending delete requests to the history service.
   bool has_pending_delete_request_;
 
   // Tracker for delete requests to the history service.
   base::CancelableTaskTracker delete_task_tracker_;
 
   // The list of URLs that are in the process of being deleted.
   std::set<GURL> urls_to_be_deleted_;
 
   // The info value that is returned to the front end with the query results.
   base::DictionaryValue results_info_value_;
 
   // The list of query results received from the history service.
   std::vector<HistoryEntry> query_results_;
 
   // The list of query results received from the history server.
   std::vector<HistoryEntry> web_history_query_results_;
 
   // Timer used to implement a timeout on a Web History response.
   base::OneShotTimer<BrowsingHistoryHandler> web_history_timer_;
 
+  ScopedObserver<HistoryService, HistoryServiceObserver>
+      history_service_observer_;
+
   base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
 };
 
 class HistoryUI : public content::WebUIController {
  public:
   explicit HistoryUI(content::WebUI* web_ui);
 
   static base::RefCountedMemory* GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_