favicon handler: Consider all frames when receiving favicons from the history db

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 224 matching lines @@
   void SetFavicon(const GURL& url,
                   const GURL& icon_url,
                   const gfx::Image& image,
                   history::IconType icon_type);
 
   // Converts the FAVICON's image data to an SkBitmap and sets it on the
   // NavigationEntry.
   // If the WebContents has a delegate, it is notified of the new favicon
   // (INVALIDATE_FAVICON).
   void UpdateFavicon(content::NavigationEntry* entry,
-                     scoped_refptr<base::RefCountedMemory> data);
+      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.
@@ skipping 42 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_