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

chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm

Index: chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
index a143e434420ed0a74408fd01388f6b759968b4bb..1aaf1ebbf5d76fa17798c9bc312ac2bc902bcfb9 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
@@ -104,8 +104,8 @@ class HistoryMenuBridgeTest : public CocoaProfileTest {
   }
 
   void GotFaviconData(FaviconService::Handle handle,
-                      history::FaviconData favicon) {
-    bridge_->GotFaviconData(handle, favicon);
+                      history::FaviconData favicon_data) {
+    bridge_->GotFaviconData(handle, favicon_data);
   }
 
   CancelableRequestConsumerTSimple<HistoryMenuBridge::HistoryItem*>&
@@ -370,13 +370,17 @@ TEST_F(HistoryMenuBridgeTest, GotFaviconData) {
   GetFaviconForHistoryItem(&item);
 
   // Pretend to be called back.
-  history::FaviconData favicon;
-  favicon.known_icon = true;
-  favicon.image_data = new base::RefCountedBytes(raw);
-  favicon.expired = false;
-  favicon.icon_url = GURL();
-  favicon.icon_type = history::FAVICON;
-  GotFaviconData(item.icon_handle, favicon);
+  history::FaviconBitmapData favicon_bitmap_data;
+  favicon_bitmap_data.expired = false;
+  favicon_bitmap_data.bitmap_data = new base::RefCountedBytes(raw);
+  favicon_bitmap_data.pixel_size = gfx::Size();
+
+  FaviconData favicon_data;
+  favicon_data.icon_type = history::FAVICON;
+  favicon_data.icon_url = GURL();
+  favicon_data.bitmaps.push_back(favicon_bitmap_data);
+  favicon_data.sizes.push_back(gfx::Size());
+  GotFaviconData(item.icon_handle, favicon_data);
 
   // Make sure the callback works.
   EXPECT_FALSE(item.icon_requested);