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 85 matching lines @@
     tab.navigations.push_back(
         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);
+  void GotFaviconData(
+      FaviconService::Handle handle,
+      const history::FaviconImageResult& image_result) {
+    bridge_->GotFaviconData(handle, image_result);
   }
 
   CancelableRequestConsumerTSimple<HistoryMenuBridge::HistoryItem*>&
       favicon_consumer() {
     return bridge_->favicon_consumer_;
   }
 
   scoped_ptr<MockBridge> bridge_;
 };
 
@@ skipping 232 matching lines @@
   EXPECT_GT(item.icon_handle, 0);
 }
 
 TEST_F(HistoryMenuBridgeTest, GotFaviconData) {
   // Create a dummy bitmap.
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, 25, 25);
   bitmap.allocPixels();
   bitmap.eraseRGB(255, 0, 0);
 
-  // Convert it to raw PNG bytes. We totally ignore color order here because
-  // we just want to test the roundtrip through the Bridge, not that we can
-  // 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::FaviconImageResult image_result;
+  image_result.image = gfx::Image(bitmap);
+  GotFaviconData(item.icon_handle, image_result);
 
   // Make sure the callback works.
   EXPECT_FALSE(item.icon_requested);
   EXPECT_TRUE(item.icon.get());
   EXPECT_TRUE([item.menu_item image]);
 }
 
 }  // namespace