Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/sync/glue/favicon_cache.cc

 // Copyright 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.
 
 #include "chrome/browser/sync/glue/favicon_cache.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"

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

Again, unused #include ;-)

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

Done.

 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_notifications.h"
+#include "chrome/browser/history/history_service.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "components/history/core/browser/history_types.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "sync/api/time.h"
 #include "sync/protocol/favicon_image_specifics.pb.h"
 #include "sync/protocol/favicon_tracking_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "ui/gfx/favicon_size.h"
 
 namespace browser_sync {
 
 // Synced favicon storage and tracking.
 // Note: we don't use the favicon service for storing these because these
@@ skipping 193 matching lines @@
     return FaviconInfoHasTracking(favicon_info);
   NOTREACHED();
   return false;
 }
 
 }  // namespace
 
 FaviconCache::FaviconCache(Profile* profile, int max_sync_favicon_limit)
     : profile_(profile),
       max_sync_favicon_limit_(max_sync_favicon_limit),
+      history_service_observer_(this),
       weak_ptr_factory_(this) {
-  notification_registrar_.Add(this,
-                              chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                              content::Source<Profile>(profile_));
+  HistoryService* hs = NULL;
+  if (profile_)
+    hs = HistoryServiceFactory::GetForProfile(profile_,
+                                              Profile::EXPLICIT_ACCESS);
+  if (hs)
+    history_service_observer_.Add(hs);
   DVLOG(1) << "Setting favicon limit to " << max_sync_favicon_limit;
 }
 
 FaviconCache::~FaviconCache() {}
 
 syncer::SyncMergeResult FaviconCache::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
     scoped_ptr<syncer::SyncErrorFactory> error_handler) {
@@ skipping 321 matching lines @@
   UpdateFaviconVisitTime(icon_url,
                          syncer::ProtoTimeToTime(visit_time_ms));
 
   UpdateSyncState(icon_url,
                   syncer::SyncChange::ACTION_ADD,
                   (added_tracking ?
                    syncer::SyncChange::ACTION_ADD :
                    syncer::SyncChange::ACTION_UPDATE));
 }
 
-void FaviconCache::Observe(int type,
-                           const content::NotificationSource& source,
-                           const content::NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::NOTIFICATION_HISTORY_URLS_DELETED);
-
-  content::Details<history::URLsDeletedDetails> deleted_details(details);
-
-  // We only care about actual user (or sync) deletions.
-  if (deleted_details->expired)
-    return;
-
-  if (!deleted_details->all_history) {
-    DeleteSyncedFavicons(deleted_details->favicon_urls);
-    return;
-  }
-
-  // All history was cleared: just delete all favicons.
-  DVLOG(1) << "History clear detected, deleting all synced favicons.";
-  syncer::SyncChangeList image_deletions, tracking_deletions;
-  while (!synced_favicons_.empty()) {
-    DeleteSyncedFavicon(synced_favicons_.begin(),
-                        &image_deletions,
-                        &tracking_deletions);
-  }
-
-  if (favicon_images_sync_processor_.get()) {
-    favicon_images_sync_processor_->ProcessSyncChanges(FROM_HERE,
-                                                       image_deletions);
-  }
-  if (favicon_tracking_sync_processor_.get()) {
-    favicon_tracking_sync_processor_->ProcessSyncChanges(FROM_HERE,
-                                                         tracking_deletions);
-  }
-}
-
 bool FaviconCache::FaviconRecencyFunctor::operator()(
     const linked_ptr<SyncedFaviconInfo>& lhs,
     const linked_ptr<SyncedFaviconInfo>& rhs) const {
   // TODO(zea): incorporate bookmarked status here once we care about it.
   if (lhs->last_visit_time < rhs->last_visit_time)
     return true;
   else if (lhs->last_visit_time == rhs->last_visit_time)
     return lhs->favicon_url.spec() < rhs->favicon_url.spec();
   return false;
 }
@@ skipping 439 matching lines @@
 }
 
 size_t FaviconCache::NumFaviconsForTest() const {
   return synced_favicons_.size();
 }
 
 size_t FaviconCache::NumTasksForTest() const {
   return page_task_map_.size();
 }
 
+void FaviconCache::OnURLsDeleted(
+    HistoryService* history_service,
+    const history::URLsDeletedDetails& deleted_details) {
+  // We only care about actual user (or sync) deletions.
+  if (deleted_details.expired)
+    return;
+
+  if (!deleted_details.all_history) {
+    DeleteSyncedFavicons(deleted_details.favicon_urls);
+    return;
+  }
+
+  // All history was cleared: just delete all favicons.
+  DVLOG(1) << "History clear detected, deleting all synced favicons.";
+  syncer::SyncChangeList image_deletions, tracking_deletions;
+  while (!synced_favicons_.empty()) {
+    DeleteSyncedFavicon(synced_favicons_.begin(), &image_deletions,
+                        &tracking_deletions);
+  }
+
+  if (favicon_images_sync_processor_.get()) {
+    favicon_images_sync_processor_->ProcessSyncChanges(FROM_HERE,
+                                                       image_deletions);
+  }
+  if (favicon_tracking_sync_processor_.get()) {
+    favicon_tracking_sync_processor_->ProcessSyncChanges(FROM_HERE,
+                                                         tracking_deletions);
+  }
+}
+
 }  // namespace browser_sync