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

chrome/browser/jumplist_win.h

Index: chrome/browser/jumplist_win.h
diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h
index 5cd8fdc277399cf1b3a19ffe6901f9203cd84439..cf334d1e9278894f0033dc20ac69810ee563ada7 100644
--- a/chrome/browser/jumplist_win.h
+++ b/chrome/browser/jumplist_win.h
@@ -17,6 +17,7 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 
 namespace content {
 class NotificationRegistrar;
@@ -51,7 +52,7 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
   const std::wstring& title() const { return title_; }
   const std::wstring& icon() const { return icon_; }
   int index() const { return index_; }
-  scoped_refptr<base::RefCountedMemory> data() const { return data_; }
+  const SkBitmap& data() const { return data_; }
 
   void SetArguments(const std::wstring& arguments) {
     arguments_ = arguments;
@@ -67,7 +68,7 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
     favicon_ = favicon;
   }
 
-  void SetIconData(scoped_refptr<base::RefCountedMemory> data) {
+  void SetIconData(const SkBitmap& data) {
     data_ = data;
   }
 
@@ -79,7 +80,7 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
   std::wstring arguments_;
   std::wstring title_;
   std::wstring icon_;
-  scoped_refptr<base::RefCountedMemory> data_;
+  SkBitmap data_;
   int index_;
   bool favicon_;
 
@@ -176,8 +177,9 @@ class JumpList : public TabRestoreServiceObserver,
   // a ShellLinkItem object.
   // When finishing loading all favicons, this function posts a task that
   // decompresses collected favicons and updates a JumpList.
-  void OnFaviconDataAvailable(HistoryService::Handle handle,
-                              history::FaviconData favicon);
+  void OnFaviconDataAvailable(
+      HistoryService::Handle handle,
+      const history::FaviconImageResult& image_result);
 
   // Callback for TopSites that notifies when the "Most
   // Visited" list is available. This function updates the ShellLinkItemList
@@ -190,9 +192,9 @@ class JumpList : public TabRestoreServiceObserver,
   // has been fetched.
   void RunUpdate();
 
-  // Helper method for RunUpdate to decode the data about the asynchrounously
+  // Helper method for RunUpdate to create icon files for the asynchrounously
   // loaded icons.
-  void DecodeIconData(const ShellLinkItemList& item_list);
+  void CreateIconFiles(const ShellLinkItemList& item_list);
 
  private:
   friend class base::RefCountedThreadSafe<JumpList>;