Make BrowsingDataHandler observe WebHistoryService deletions

chrome/browser/ui/webui/browsing_history_handler.h

 // Copyright 2015 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_BROWSING_HISTORY_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #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 "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/url_row.h"
 #include "components/history/core/browser/web_history_service.h"
+#include "components/history/core/browser/web_history_service_observer.h"
+#include "components/sync/driver/sync_service_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "url/gurl.h"
 
 class ProfileSyncService;
 class SupervisedUserService;
 
 namespace bookmarks {
 class BookmarkModel;
 }
 
 namespace history {
 class HistoryService;
 struct QueryOptions;
 class QueryResults;
 }
 
+namespace sync_driver {
+class SyncServiceObserver;
+}
+
 // The handler for Javascript messages related to the "history" view.
 class BrowsingHistoryHandler : public content::WebUIMessageHandler,
-                               public history::HistoryServiceObserver {
+                               public history::HistoryServiceObserver,
+                               public history::WebHistoryServiceObserver,
+                               public sync_driver::SyncServiceObserver {
  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 47 matching lines @@
     // Whether this entry was blocked when it was attempted.
     bool blocked_visit;
   };
 
   BrowsingHistoryHandler();
   ~BrowsingHistoryHandler() override;
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
+  // SyncServiceObserver implementation.
+  void OnStateChanged() override;
+
   // Handler for the "queryHistory" message.
   void HandleQueryHistory(const base::ListValue* args);
 
   // 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.
@@ skipping 63 matching lines @@
   // kAcceptLanguages pref value.
   std::string GetAcceptLanguages() const;
 
   // history::HistoryServiceObserver:
   void OnURLsDeleted(history::HistoryService* history_service,
                      bool all_history,
                      bool expired,
                      const history::URLRows& deleted_rows,
                      const std::set<GURL>& favicon_urls) override;
 
+  // history::WebHistoryServiceObserver:
+  void OnWebHistoryDeleted() 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.
   std::unique_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 web_history_timer_;
 
+  // HistoryService (local history) observer.
   ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
       history_service_observer_;
 
+  // WebHistoryService (synced history) observer.
+  ScopedObserver<history::WebHistoryService, history::WebHistoryServiceObserver>
+      web_history_service_observer_;
+
+  // ProfileSyncService observer listens to late initialization of history sync.
+  ScopedObserver<ProfileSyncService, sync_driver::SyncServiceObserver>
+      sync_service_observer_;
+
   // Whether the last call to Web History returned synced results.
   bool has_synced_results_;
 
   // Whether there are other forms of browsing history on the history server.
   bool has_other_forms_of_browsing_history_;
 
   base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_