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

chrome/browser/favicon/favicon_service.cc

Index: chrome/browser/favicon/favicon_service.cc
diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc
index 6c55b307fd75475ad91d8a8448a4aa5aa5b421dd..3621b407d224b6c42ca0ad274a3153c8d3756c21 100644
--- a/chrome/browser/favicon/favicon_service.cc
+++ b/chrome/browser/favicon/favicon_service.cc
@@ -70,26 +70,6 @@ FaviconService::Handle FaviconService::GetFaviconForURL(
   return handle;
 }
 
-// Requests the favicon for |favicon_id|. The |consumer| is notified when the
-// bits have been fetched.
-FaviconService::Handle FaviconService::GetFaviconForID(
-    history::FaviconID favicon_id,
-    CancelableRequestConsumerBase* consumer,
-    const FaviconDataCallback& callback) {
-  GetFaviconRequest* request = new GetFaviconRequest(callback);
-  AddRequest(request, consumer);
-  FaviconService::Handle handle = request->handle();
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs)
-    hs->GetFaviconForID(request, favicon_id);
-  else
-    ForwardEmptyResultAsync(request);
-
-  return handle;
-}
-
-
 void FaviconService::SetFaviconOutOfDateForPage(const GURL& page_url) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
@@ -127,5 +107,6 @@ FaviconService::~FaviconService() {
 }
 
 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) {
-  request->ForwardResultAsync(request->handle(), history::FaviconData());
+  request->ForwardResultAsync(request->handle(), history::FaviconData(),
+                              std::vector<GURL>());
 }