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

chrome/browser/favicon/favicon_util.h

Index: chrome/browser/favicon/favicon_util.h
diff --git a/chrome/browser/favicon/favicon_util.h b/chrome/browser/favicon/favicon_util.h
index acaf90186c7b7348d52296b913b07c47cf0ecf01..a7e203f06d089d1cf8422fefc289423165ec1124 100644
--- a/chrome/browser/favicon/favicon_util.h
+++ b/chrome/browser/favicon/favicon_util.h
@@ -5,12 +5,22 @@
 #ifndef CHROME_BROWSER_FAVICON_FAVICON_UTIL_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_UTIL_H_
 
+#include "ui/base/layout.h"
+
 class GURL;
 
 namespace content {
 class RenderViewHost;
 }
 
+namespace gfx {
+class Image;
+}
+
+namespace history {
+struct FaviconBitmapResult;
+}
+
 // Utility class for common favicon related code.
 class FaviconUtil {
  public:
@@ -22,6 +32,13 @@ class FaviconUtil {
   static int DownloadFavicon(content::RenderViewHost* rvh,
                              const GURL& url,
                              int image_size);
+
+  // Takes a vector of png-encoded frames, decodes them, and converts them to
+  // a favicon of size favicon_size (in DIPs) at the desired ui scale factors.
+  static gfx::Image SelectFaviconFramesFromPNGs(
+      const std::vector<history::FaviconBitmapResult>& png_data,
+      const std::vector<ui::ScaleFactor> scale_factors,
+      int favicon_size);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_UTIL_H_