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

chrome/browser/favicon/favicon_handler.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_FAVICON_FAVICON_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 181 matching lines @@
 
     GURL url;
     GURL image_url;
     gfx::Image image;
     float score;
     history::IconType icon_type;
   };
 
   // See description above class for details.
   void OnFaviconDataForInitialURL(FaviconService::Handle handle,
-                                  history::FaviconData favicon);
+                                  history::FaviconData favicon,
+                                  std::vector<GURL> icon_urls_in_db);
 
   // If the favicon has expired, asks the renderer to download the favicon.
   // Otherwise asks history to update the mapping between page url and icon
   // url with a callback to OnFaviconData when done.
   void DownloadFaviconOrAskHistory(const GURL& page_url,
                                    const GURL& icon_url,
                                    history::IconType icon_type);
 
   // See description above class for details.
   void OnFaviconData(FaviconService::Handle handle,
-                     history::FaviconData favicon);
+                     history::FaviconData favicon,
+                     std::vector<GURL> icon_urls_in_db);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.
   int ScheduleDownload(const GURL& url,
                        const GURL& image_url,
                        int image_size,
                        history::IconType icon_type,
                        const FaviconTabHelper::ImageDownloadCallback& callback);
 
   // Updates |favicon_candidate_| and returns true if it is an exact match.
@@ skipping 70 matching lines @@
   // This handler's delegate.
   FaviconHandlerDelegate* delegate_;  // weak
 
   // Current favicon candidate.
   FaviconCandidate favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_