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

chrome/browser/history/history_marshaling.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.
 
 // Data structures for communication between the history service on the main
 // thread and the backend on the history thread.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_
 
@@ skipping 39 matching lines @@
                            history::FilteredURLList>
     QueryFilteredURLsRequest;
 
 // Thumbnails -----------------------------------------------------------------
 
 typedef CancelableRequest<HistoryService::ThumbnailDataCallback>
     GetPageThumbnailRequest;
 
 // Favicons -------------------------------------------------------------------
 
-typedef CancelableRequest<FaviconService::FaviconDataCallback>
+typedef CancelableRequest<FaviconService::FaviconResultsCallback>
     GetFaviconRequest;
 
 // Downloads ------------------------------------------------------------------
 
 typedef CancelableRequest1<HistoryService::DownloadNextIdCallback,
                            int/*next_id*/>
     DownloadNextIdRequest;
 
 
 typedef CancelableRequest1<HistoryService::DownloadQueryCallback,
@@ skipping 20 matching lines @@
 
 // The argument here is an input value, which is the task to run on the
 // background thread. The callback is used to execute the portion of the task
 // that executes on the main thread.
 typedef CancelableRequest1<base::Closure, scoped_refptr<HistoryDBTask> >
     HistoryDBTaskRequest;
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_MARSHALING_H_