Update all bookmarks which use an icon URL when a favicon's bitmap is updated

components/history/core/browser/history_service.h

Index: components/history/core/browser/history_service.h
diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h
index 148e2a14ea4508f65a066b96373afdd1c94d9f07..31040c9a87f90a6a503f1cd5016a00fba2a966aa 100644
--- a/components/history/core/browser/history_service.h
+++ b/components/history/core/browser/history_service.h
@@ -440,13 +440,19 @@ class HistoryService : public syncer::SyncableService, public KeyedService {
       scoped_ptr<HistoryDBTask> task,
       base::CancelableTaskTracker* tracker);
 
-  // This callback is invoked when favicon change for urls.
-  typedef base::Callback<void(const std::set<GURL>&)> OnFaviconChangedCallback;
+  // Callback for when favicon data changes. The first std::vector contains a
+  // list of page URLs for which the favicon data has changed. The second
+  // std::vector contains a list of icon URLs for which the favicon data has
+  // changed.
+  typedef base::Callback<void(const std::vector<GURL>&,
+                              const std::vector<GURL>&)>
+      OnFaviconChangedCallback;

[Roger McFarlane (Chromium), 2015/05/13 18:28:12]

uber-nit: OnFaviconsChangedCallback

[pkotwicz, 2015/05/14 14:18:54]

Thanks for catching this!

 
   // Add a callback to the list. The callback will remain registered until the
-  // returned Subscription is destroyed. This must occurs before HistoryService
-  // is destroyed.
-  scoped_ptr<base::CallbackList<void(const std::set<GURL>&)>::Subscription>
+  // returned Subscription is destroyed. The Subscription must be destroyed
+  // before HistoryService is destroyed.
+  scoped_ptr<base::CallbackList<void(const std::vector<GURL>&,
+                                     const std::vector<GURL>&)>::Subscription>
   AddFaviconChangedCallback(const OnFaviconChangedCallback& callback)
       WARN_UNUSED_RESULT;
 
@@ -762,8 +768,11 @@ class HistoryService : public syncer::SyncableService, public KeyedService {
   // specified priority. The task will have ownership taken.
   void ScheduleTask(SchedulePriority priority, const base::Closure& task);
 
-  // Invokes all callback registered by AddFaviconChangedCallback.
-  void NotifyFaviconChanged(const std::set<GURL>& changed_favicons);
+  // Called when the favicons for the given page URLs (e.g.
+  // http://www.google.com) and the given icon URLs (e.g.
+  // http://www.google.com/favicon.ico) have changed.
+  void NotifyFaviconsChanged(const std::vector<GURL>& page_urls,
+                             const std::vector<GURL>& icon_urls);
 
   base::ThreadChecker thread_checker_;
 
@@ -798,7 +807,7 @@ class HistoryService : public syncer::SyncableService, public KeyedService {
   bool backend_loaded_;
 
   ObserverList<HistoryServiceObserver> observers_;
-  base::CallbackList<void(const std::set<GURL>&)>
+  base::CallbackList<void(const std::vector<GURL>&, const std::vector<GURL>&)>
       favicon_changed_callback_list_;
 
   DeleteDirectiveHandler delete_directive_handler_;