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

chrome/browser/extensions/extension_web_ui.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 113 matching lines @@
     }
   }
 
  private:
   ~ExtensionWebUIImageLoadingTracker() {}
 
   // Forwards the result on the request. If no favicon was available then
   // |icon_data| may be backed by NULL. Once the result has been forwarded the
   // instance is deleted.
   void ForwardResult(scoped_refptr<base::RefCountedMemory> icon_data) {
-    history::FaviconData favicon;
-    favicon.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
-    favicon.image_data = icon_data;
-    favicon.icon_type = history::FAVICON;
-    request_->ForwardResultAsync(request_->handle(), favicon);
+    history::FaviconData favicon_data;
+    favicon_data.known_icon = icon_data.get() != NULL && icon_data->size() > 0;
+    favicon_data.icon_type = history::FAVICON;
+    history::FaviconBitmapData favicon_bitmap_data;
+    favicon_bitmap_data.bitmap_data = icon_data;
+    favicon_data.bitmaps.push_back(favicon_bitmap_data);
+    request_->ForwardResultAsync(request_->handle(), favicon_data,
+                                 std::vector<GURL>());
     delete this;
   }
 
   ImageLoadingTracker tracker_;
   scoped_refptr<FaviconService::GetFaviconRequest> request_;
   const Extension* extension_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWebUIImageLoadingTracker);
 };
 
@@ skipping 273 matching lines @@
 }
 
 // static
 void ExtensionWebUI::GetFaviconForURL(Profile* profile,
     FaviconService::GetFaviconRequest* request, const GURL& page_url) {
   // tracker deletes itself when done.
   ExtensionWebUIImageLoadingTracker* tracker =
       new ExtensionWebUIImageLoadingTracker(profile, request, page_url);
   tracker->Init();
 }