Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/sync/glue/session_model_associator.h

Index: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index e87dd17b1426c9e16579b04a6898b15d0f88d9db..375d76a40904a16c633b3e5a9dbc517ee8b6b75d 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -434,7 +434,8 @@ class SessionModelAssociator
   // Callback method to store a tab's favicon into its sync node once it becomes
   // available. Does nothing if no favicon data was available.
   void OnFaviconDataAvailable(FaviconService::Handle handle,
-                              history::FaviconData favicon);
+                              history::FaviconData favicon_data,
+                              std::vector<GURL> icon_urls_in_db);
 
   // Used to populate a session header from the session specifics header
   // provided.