Applied the IconType.

chrome/browser/possible_url_model.cc

 // Copyright (c) 2010 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/possible_url_model.h"
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 145 matching lines @@
   if (i != fav_icon_map_.end()) {
     // We already requested the favicon, return it.
     if (!i->second.isNull())
       return i->second;
   } else if (profile_) {
     FaviconService* favicon_service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     if (favicon_service) {
       CancelableRequestProvider::Handle h =
           favicon_service->GetFaviconForURL(
-              result.url, &consumer_,
+              result.url, history::FAV_ICON, &consumer_,
               NewCallback(this, &PossibleURLModel::OnFavIconAvailable));
       consumer_.SetClientData(favicon_service, h, result.index);
       // Add an entry to the map so that we don't attempt to request the
       // favicon again.
       fav_icon_map_[result.index] = SkBitmap();
     }
   }
   return *default_fav_icon;
 }
 
 int PossibleURLModel::CompareValues(int row1, int row2, int column_id) {
   if (column_id == IDS_ASI_URL_COLUMN) {
     return results_[row1].display_url.Compare(
         results_[row2].display_url, GetCollator());
   }
   return ui::TableModel::CompareValues(row1, row2, column_id);
 }
 
 void PossibleURLModel::OnFavIconAvailable(
     FaviconService::Handle h,
-    bool fav_icon_available,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    FaviconService::FaviconData favicon) {
   if (profile_) {
     FaviconService* favicon_service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     size_t index = consumer_.GetClientData(favicon_service, h);
-    if (fav_icon_available) {
+    if (favicon.known_icon) {
       // The decoder will leave our bitmap empty on error.
-      gfx::PNGCodec::Decode(data->front(), data->size(),
+      gfx::PNGCodec::Decode(favicon.image_data->front(),
+                            favicon.image_data->size(),
                             &(fav_icon_map_[index]));
 
       // Notify the observer.
       if (!fav_icon_map_[index].isNull() && observer_)
         observer_->OnItemsChanged(static_cast<int>(index), 1);
     }
   }
 }
 
 void PossibleURLModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }