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

chrome/browser/history/android/sqlite_cursor.h

Index: chrome/browser/history/android/sqlite_cursor.h
diff --git a/chrome/browser/history/android/sqlite_cursor.h b/chrome/browser/history/android/sqlite_cursor.h
index de96e1a3e91f136ca02221bbb6700f9dd54c7098..f144397cac89a774df6024f0a004e1a78598a35a 100644
--- a/chrome/browser/history/android/sqlite_cursor.h
+++ b/chrome/browser/history/android/sqlite_cursor.h
@@ -147,11 +147,11 @@ class SQLiteCursor {
   void GetFaviconForIDInUIThread(
       history::FaviconID id,
       CancelableRequestConsumerBase* consumer,
-      const FaviconService::FaviconDataCallback& callback);
+      const FaviconService::FaviconRawCallback& callback);
 
   // The Callback function of GetFavicon().
   void OnFaviconData(FaviconService::Handle handle,
-                     history::FaviconData favicon);
+                     const history::FaviconBitmapResult& bitmap_result);
 
   // The callback function of MoveTo().
   void OnMoved(AndroidHistoryProviderService::Handle handle,
@@ -186,7 +186,7 @@ class SQLiteCursor {
   int count_;
 
   // The favicon image.
-  history::FaviconData favicon_;
+  history::FaviconBitmapResult favicon_bitmap_result_;
 
   TestObserver* test_observer_;