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

chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 86 matching lines @@
         TabNavigation(0, url, content::Referrer(), title, std::string(),
                       content::PAGE_TRANSITION_LINK));
     return tab;
   }
 
   void GetFaviconForHistoryItem(HistoryMenuBridge::HistoryItem* item) {
     bridge_->GetFaviconForHistoryItem(item);
   }
 
   void GotFaviconData(FaviconService::Handle handle,
-                      history::FaviconData favicon) {
-    bridge_->GotFaviconData(handle, favicon);
+                      history::FaviconData favicon_data) {
+    bridge_->GotFaviconData(handle, favicon_data);
   }
 
   CancelableRequestConsumerTSimple<HistoryMenuBridge::HistoryItem*>&
       favicon_consumer() {
     return bridge_->favicon_consumer_;
   }
 
   scoped_ptr<MockBridge> bridge_;
 };
 
@@ skipping 244 matching lines @@
   // make icons look pretty.
   std::vector<unsigned char> raw;
   gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &raw);
 
   // Set up the HistoryItem.
   HistoryMenuBridge::HistoryItem item;
   item.menu_item.reset([[NSMenuItem alloc] init]);
   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);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace