Refactor HistoryService to not send NOTIFICATION_FAVICON_CHANGED

chrome/browser/sync/sessions/notification_service_sessions_router.cc

 // Copyright 2014 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/sessions/notification_service_sessions_router.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/favicon/favicon_changed_details.h"
+#include "chrome/browser/history/history_service.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/sync_start_util.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
 #include "chrome/browser/sync/sessions/sessions_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 25 matching lines @@
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED,
       content::NotificationService::AllSources());
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   registrar_.Add(this,
       chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
       content::NotificationService::AllSources());
   registrar_.Add(this,
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, chrome::NOTIFICATION_FAVICON_CHANGED,
-      content::Source<Profile>(profile_));
+  HistoryService* history_service =
+      HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
+  if (history_service) {
+    favicon_changed_subscription_ = history_service->AddFaviconChangedCallback(
+        base::Bind(&NotificationServiceSessionsRouter::OnFaviconChanged,
+                   base::Unretained(this)));
+  }
 #if defined(ENABLE_MANAGED_USERS)
   if (profile_->IsSupervised()) {
     SupervisedUserService* supervised_user_service =
         SupervisedUserServiceFactory::GetForProfile(profile_);
     supervised_user_service->AddNavigationBlockedCallback(
         base::Bind(&NotificationServiceSessionsRouter::OnNavigationBlocked,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 #endif
 }
 
 NotificationServiceSessionsRouter::~NotificationServiceSessionsRouter() {}
 
 void NotificationServiceSessionsRouter::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_FAVICON_CHANGED: {
-      content::Details<FaviconChangedDetails> favicon_details(details);
-      if (handler_)
-        handler_->OnFaviconPageUrlsUpdated(favicon_details->urls);
-      return;
-    }
     // Source<WebContents>.
     case chrome::NOTIFICATION_TAB_PARENTED:
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME:
     case content::NOTIFICATION_WEB_CONTENTS_DESTROYED: {
       WebContents* web_contents = content::Source<WebContents>(source).ptr();
       SyncedTabDelegate* tab =
           SyncedTabDelegate::ImplFromWebContents(web_contents);
       if (!tab || tab->profile() != profile_)
         return;
       if (handler_)
@@ skipping 50 matching lines @@
     content::WebContents* web_contents) {
   SyncedTabDelegate* tab =
       SyncedTabDelegate::ImplFromWebContents(web_contents);
   if (!tab || !handler_)
     return;
 
   DCHECK(tab->profile() == profile_);
   handler_->OnLocalTabModified(tab);
 }
 
+void NotificationServiceSessionsRouter::OnFaviconChanged(
+    const std::set<GURL>& changed_favicons) {
+  if (handler_)
+    handler_->OnFaviconPageUrlsUpdated(changed_favicons);
+}
+
 void NotificationServiceSessionsRouter::StartRoutingTo(
     LocalSessionEventHandler* handler) {
   DCHECK(!handler_);
   handler_ = handler;
 }
 
 void NotificationServiceSessionsRouter::Stop() {
   weak_ptr_factory_.InvalidateWeakPtrs();
   handler_ = NULL;
 }
 
 }  // namespace browser_sync