Applied the IconType.

chrome/browser/bookmarks/bookmark_model.cc

Index: chrome/browser/bookmarks/bookmark_model.cc
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index e1c988da63c2ca5a1decd0866d9c3951c0f52940..432e6b926f7464ad1a6b6ebde9f79de07634073d 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -734,18 +734,16 @@ BookmarkNode* BookmarkModel::CreateRootNodeFromStarredEntry(
 
 void BookmarkModel::OnFavIconDataAvailable(
     FaviconService::Handle handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    history::FaviconData favicon) {
   SkBitmap fav_icon;
   BookmarkNode* node =
       load_consumer_.GetClientData(
           profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
   DCHECK(node);
   node->set_favicon_load_handle(0);
-  if (know_favicon && data.get() && data->size() &&
-      gfx::PNGCodec::Decode(data->front(), data->size(), &fav_icon)) {
+  if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(),
+                                                  favicon.image_data->size(),
+                                                  &fav_icon)) {
     node->set_favicon(fav_icon);
     FavIconLoaded(node);
   }
@@ -761,7 +759,7 @@ void BookmarkModel::LoadFavIcon(BookmarkNode* node) {
   if (!favicon_service)
     return;
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      node->GetURL(), &load_consumer_,
+      node->GetURL(), history::FAV_ICON, &load_consumer_,
       NewCallback(this, &BookmarkModel::OnFavIconDataAvailable));
   load_consumer_.SetClientData(favicon_service, handle, node);
   node->set_favicon_load_handle(handle);