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

chrome/browser/history/android/sqlite_cursor.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_
 #define CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_
 
 #include <jni.h>
 #include <vector>
 
@@ skipping 129 matching lines @@
     test_observer_ = test_observer;
   }
 
   // Get Favicon from history backend.
   bool GetFavicon(history::FaviconID id,
                   std::vector<unsigned char>* image_data);
 
   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,
                int pos);
 
   // Used to cancel all request on the UI thread during shutdown.
   void CancelAllRequests(base::WaitableEvent* finished);
 
   JavaColumnType GetColumnTypeInternal(int column);
 
@@ skipping 14 matching lines @@
   AndroidHistoryProviderService* service_;
 
   FaviconService* favicon_service_;
 
   CancelableRequestConsumer consumer_;
 
   // The count of result rows.
   int count_;
 
   // The favicon image.
-  history::FaviconData favicon_;
+  history::FaviconBitmapResult favicon_bitmap_result_;
 
   TestObserver* test_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SQLiteCursor);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_SQLITE_CURSOR_H_