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

chrome/browser/sync/sessions/sessions_sync_manager.h

Index: chrome/browser/sync/sessions/sessions_sync_manager.h
diff --git a/chrome/browser/sync/sessions/sessions_sync_manager.h b/chrome/browser/sync/sessions/sessions_sync_manager.h
index cae754d8d27aef289447cd362dec350e2fc477e6..ffde46cb55b2d239539798b308d0b5deecfb71b3 100644
--- a/chrome/browser/sync/sessions/sessions_sync_manager.h
+++ b/chrome/browser/sync/sessions/sessions_sync_manager.h
@@ -63,12 +63,14 @@ class LocalSessionEventHandler {
   virtual void OnLocalTabModified(SyncedTabDelegate* modified_tab) = 0;
 
   // A local navigation occurred that triggered updates to favicon data for
-  // each URL in |updated_page_urls|.  This is routed through Sessions Sync so
-  // that we can filter (exclude) favicon updates for pages that aren't
-  // currently part of the set of local open tabs, and pass relevant updates
-  // on to FaviconCache for out-of-band favicon syncing.
-  virtual void OnFaviconPageUrlsUpdated(
-      const std::set<GURL>& updated_page_urls) = 0;
+  // each page URL in |page_urls| (e.g. http://www.google.com) and each icon
+  // URL in |icon_urls| (e.g. http://www.google.com/favicon.ico). This is
+  // routed through Sessions Sync so that we can filter (exclude) favicon
+  // updates for pages that aren't currently part of the set of local open
+  // tabs, and pass relevant updates on to FaviconCache for out-of-band favicon
+  // syncing.
+  virtual void OnFaviconsChanged(const std::vector<GURL>& page_urls,
+                                 const std::vector<GURL>& icon_urls) = 0;
 };
 
 // The LocalSessionEventRouter is responsible for hooking itself up to various
@@ -121,8 +123,8 @@ class SessionsSyncManager : public syncer::SyncableService,
 
   // LocalSessionEventHandler implementation.
   void OnLocalTabModified(SyncedTabDelegate* modified_tab) override;
-  void OnFaviconPageUrlsUpdated(
-      const std::set<GURL>& updated_favicon_page_urls) override;
+  void OnFaviconsChanged(const std::vector<GURL>& page_urls,
+                         const std::vector<GURL>& icon_urls) override;
 
   // Returns the tag used to uniquely identify this machine's session in the
   // sync model.