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

chrome/browser/ui/toolbar/back_forward_menu_model.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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 235 matching lines @@
     return;
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
       entry->GetURL(), history::FAVICON, &load_consumer_,
       base::Bind(&BackForwardMenuModel::OnFavIconDataAvailable,
                  base::Unretained(this)));
   load_consumer_.SetClientData(favicon_service, handle, entry->GetUniqueID());
 }
 
 void BackForwardMenuModel::OnFavIconDataAvailable(
     FaviconService::Handle handle,
-    history::FaviconData favicon) {
-  if (favicon.is_valid()) {
+    history::FaviconData favicon_data,
+    std::vector<GURL> icon_urls_in_db) {
+  if (favicon_data.has_valid_bitmaps()) {
     int unique_id = load_consumer_.GetClientDataForCurrentRequest();
     // Find the current model_index for the unique_id.
     NavigationEntry* entry = NULL;
     int model_index = -1;
     for (int i = 0; i < GetItemCount() - 1; i++) {
       if (IsSeparator(i))
         continue;
       if (GetNavigationEntry(i)->GetUniqueID() == unique_id) {
         model_index = i;
         entry = GetNavigationEntry(i);
         break;
       }
     }
 
     if (!entry)
       // The NavigationEntry wasn't found, this can happen if the user
       // navigates to another page and a NavigatationEntry falls out of the
       // range of kMaxHistoryItems.
       return;
 
     // Now that we have a valid NavigationEntry, decode the favicon and assign
     // it to the NavigationEntry.
-    gfx::Image icon(favicon.image_data->front(), favicon.image_data->size());
+    scoped_refptr<base::RefCountedMemory> bitmap_data(
+        favicon_data.first_bitmap());
+    gfx::Image icon(bitmap_data->front(), bitmap_data->size());
     if (!icon.IsEmpty()) {
       entry->GetFavicon().valid = true;
-      entry->GetFavicon().url = favicon.icon_url;
+      entry->GetFavicon().url = favicon_data.icon_url;
       // TODO: Once the history service returns more representations,
       // use them all instead of having just the lodpi favicon.
       entry->GetFavicon().image = icon;
       if (menu_model_delegate()) {
         menu_model_delegate()->OnIconChanged(model_index);
       }
     }
   }
 }
 
@@ skipping 172 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }