Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/sync/glue/favicon_cache.h

 // Copyright (c) 2013 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_SYNC_GLUE_FAVICON_CACHE_H_
 #define CHROME_BROWSER_SYNC_GLUE_FAVICON_CACHE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_observer.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/sessions/session_id.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/syncable_service.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace chrome {
 struct FaviconRawBitmapResult;
 }
 
 namespace browser_sync {
 
 enum IconSize {
   SIZE_INVALID,
   SIZE_16,
   SIZE_32,
   SIZE_64,
   NUM_SIZES
 };
 
 struct SyncedFaviconInfo;
 
 // Encapsulates the logic for loading and storing synced favicons.
 // TODO(zea): make this a KeyedService.
 class FaviconCache : public syncer::SyncableService,
-                     public content::NotificationObserver {
+                     public history::HistoryServiceObserver {
  public:
   FaviconCache(Profile* profile, int max_sync_favicon_limit);
   ~FaviconCache() override;
 
   // SyncableService implementation.
   syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
@@ skipping 29 matching lines @@
   void OnFaviconVisited(const GURL& page_url, const GURL& favicon_url);
 
   // Consume Session sync favicon data. Will not overwrite existing favicons.
   // If |icon_bytes| is empty, only updates the page->favicon url mapping.
   // Safe to call within a transaction.
   void OnReceivedSyncFavicon(const GURL& page_url,
                              const GURL& icon_url,
                              const std::string& icon_bytes,
                              int64 visit_time_ms);
 
-  // NotificationObserver implementation.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
  private:
   friend class SyncFaviconCacheTest;
+  FRIEND_TEST_ALL_PREFIXES(SyncFaviconCacheTest, HistoryFullClear);
+  FRIEND_TEST_ALL_PREFIXES(SyncFaviconCacheTest, HistorySubsetClear);
 
   // Functor for ordering SyncedFaviconInfo objects by recency;
   struct FaviconRecencyFunctor {
     bool operator()(const linked_ptr<SyncedFaviconInfo>& lhs,
                     const linked_ptr<SyncedFaviconInfo>& rhs) const;
   };
 
 
   // Map of favicon url to favicon image.
   typedef std::map<GURL, linked_ptr<SyncedFaviconInfo> > FaviconMap;
@@ skipping 73 matching lines @@
   void DropSyncedFavicon(FaviconMap::iterator favicon_iter);
 
   // Only drops the data associated with |type| of |favicon_iter|.
   void DropPartialFavicon(FaviconMap::iterator favicon_iter,
                           syncer::ModelType type);
 
   // For testing only.
   size_t NumFaviconsForTest() const;
   size_t NumTasksForTest() const;
 
+  // history::HistoryServiceObserver:
+  void OnURLsDeleted(HistoryService* history_service,
+                     bool all_history,
+                     bool expired,
+                     const history::URLRows& deleted_rows,
+                     const std::set<GURL>& favicon_urls) override;
+
   // Trask tracker for loading favicons.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Our actual cached favicon data.
   FaviconMap synced_favicons_;
 
   // An LRU ordering of the favicons comprising |synced_favicons_| (oldest to
   // newest).
   RecencySet recent_favicons_;
 
   // Our set of pending favicon loads, indexed by page url.
   PageTaskMap page_task_map_;
 
   // Map of page and associated favicon urls.
   PageFaviconMap page_favicon_map_;
 
   Profile* profile_;
 
   // TODO(zea): consider creating a favicon handler here for fetching unsynced
   // favicons from the web.
 
   scoped_ptr<syncer::SyncChangeProcessor> favicon_images_sync_processor_;
   scoped_ptr<syncer::SyncChangeProcessor> favicon_tracking_sync_processor_;
 
-  // For listening to history deletions.
-  content::NotificationRegistrar notification_registrar_;
-
   // Maximum number of favicons to sync. 0 means no limit.
   const size_t max_sync_favicon_limit_;
 
+  ScopedObserver<HistoryService, HistoryServiceObserver>
+      history_service_observer_;
+
   // Weak pointer factory for favicon loads.
   base::WeakPtrFactory<FaviconCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconCache);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_FAVICON_CACHE_H_