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

chrome/browser/ui/cocoa/history_menu_bridge.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.
 
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 444 matching lines @@
       profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   FaviconService::Handle handle = service->GetFaviconForURL(
       item->url, history::FAVICON, &favicon_consumer_,
       base::Bind(&HistoryMenuBridge::GotFaviconData, base::Unretained(this)));
   favicon_consumer_.SetClientData(service, handle, item);
   item->icon_handle = handle;
   item->icon_requested = true;
 }
 
 void HistoryMenuBridge::GotFaviconData(FaviconService::Handle handle,
-                                       history::FaviconData favicon) {
+                                       history::FaviconData favicon_data,
+                                       std::vector<GURL> icon_urls_in_db) {
   // Since we're going to do Cocoa-y things, make sure this is the main thread.
   DCHECK([NSThread isMainThread]);
 
   HistoryItem* item =
       favicon_consumer_.GetClientData(
           profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
   DCHECK(item);
   item->icon_requested = false;
   item->icon_handle = 0;
 
   // Convert the raw data to Skia and then to a NSImage.
   // TODO(rsesek): Is there an easier way to do this?
   SkBitmap icon;
-  if (favicon.is_valid() &&
-      gfx::PNGCodec::Decode(favicon.image_data->front(),
-          favicon.image_data->size(), &icon)) {
-    NSImage* image = gfx::SkBitmapToNSImage(icon);
-    if (image) {
-      // The conversion was successful.
-      item->icon.reset([image retain]);
-      [item->menu_item setImage:item->icon.get()];
+  if (favicon_data.has_valid_bitmaps()) {
+    scoped_refptr<base::RefCountedMemory> bitmap_data =
+        favicon_data.first_bitmap();
+    if (gfx::PNGCodec::Decode(bitmap_data->front(),

[sky, 2012/08/23 15:50:38]

Would be nice if there was a method on favicondata for this, but that can be
added later.

+                              bitmap_data->size(), &icon)) {
+      NSImage* image = gfx::SkBitmapToNSImage(icon);
+      if (image) {
+        // The conversion was successful.
+        item->icon.reset([image retain]);
+        [item->menu_item setImage:item->icon.get()];
+      }
     }
   }
 }
 
 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
   DCHECK(item);
   if (item->icon_requested) {
     FaviconService* service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     service->CancelRequest(item->icon_handle);
     item->icon_requested = false;
     item->icon_handle = 0;
   }
 }