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..52452bdba7297d58737171afa323605c808abc32 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -737,7 +737,8 @@ void BookmarkModel::OnFavIconDataAvailable(
     bool know_favicon,
     scoped_refptr<RefCountedMemory> data,
     bool expired,
-    GURL icon_url) {
+    GURL icon_url,
+    history::IconType) {

[sky, 2011/03/09 21:41:08]

Include name.

[michaelbai, 2011/03/09 23:11:45]

Done.

   SkBitmap fav_icon;
   BookmarkNode* node =
       load_consumer_.GetClientData(
@@ -761,7 +762,9 @@ 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);