Cleanup FaviconHandler

chrome/browser/favicon/favicon_handler.h

Index: chrome/browser/favicon/favicon_handler.h
diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h
index 721a49ab4091c03f2dd4b874317bc991b95d06e9..c24c2d63b46363b3c0f91fc460bf7e5710e693a3 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -115,8 +115,8 @@ class FaviconHandler {
   void OnDidDownloadFavicon(int id,

[rjkroege, 2012/09/10 15:57:08]

nit: My preference would be for this to have a comment saying what it does. But
it was like that before.

[pkotwicz, 2012/09/10 17:34:38]

Done.

                             const GURL& image_url,
                             bool errored,
-                            const gfx::Image& image,
-                            float score);
+                            int requested_size,
+                            const std::vector<SkBitmap>& bitmaps);
 
   // For testing.
   const std::deque<FaviconURL>& image_urls() const { return image_urls_; }
@@ -245,11 +245,6 @@ class FaviconHandler {
       const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results);
   void UpdateFavicon(content::NavigationEntry* entry, const gfx::Image* image);
 
-  // If the image is not already at its preferred size, scales the image such
-  // that either the width and/or height == gfx::kFaviconSize. Does nothing if
-  // the image is empty.
-  gfx::Image ResizeFaviconIfNeeded(const gfx::Image& image);
-
   void FetchFaviconInternal();
 
   // Return the current candidate if any.