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

chrome/browser/ui/search_engines/template_url_table_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 "chrome/browser/ui/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 82 matching lines @@
     }
     load_state_ = LOADING;
     favicon_service->GetFavicon(favicon_url, history::FAVICON,
         &request_consumer_,
         base::Bind(&ModelEntry::OnFaviconDataAvailable,
                    base::Unretained(this)));
   }
 
   void OnFaviconDataAvailable(
       FaviconService::Handle handle,
-      history::FaviconData favicon) {
+      history::FaviconData favicon_data,
+      std::vector<GURL> icon_urls_in_db) {
     load_state_ = LOADED;
-    if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(),
-                                                    favicon.image_data->size(),
-                                                    &favicon_)) {
-      model_->FaviconAvailable(this);
+    if (favicon_data.has_valid_bitmaps()) {
+      scoped_refptr<base::RefCountedMemory> bitmap_data(
+          favicon_data.first_bitmap());
+      if (gfx::PNGCodec::Decode(bitmap_data->front(),
+                                bitmap_data->size(),
+                                &favicon_)) {
+        model_->FaviconAvailable(this);
+      }
     }
   }
 
   TemplateURL* template_url_;
   SkBitmap favicon_;
   LoadState load_state_;
   TemplateURLTableModel* model_;
   CancelableRequestConsumer request_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(ModelEntry);
@@ skipping 247 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }