Applied the IconType.

chrome/browser/bookmarks/bookmark_html_writer.cc

Index: chrome/browser/bookmarks/bookmark_html_writer.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 7b7cd4777ac164dfdcadf900fd1e746e007b07da..5e17c6211f03c647e6835fe2811e6eeb2e2bec14 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -439,7 +439,8 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() {
     if (favicons_map_->end() == iter) {
       FaviconService* favicon_service =
           profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
-      favicon_service->GetFaviconForURL(GURL(url), &fav_icon_consumer_,
+      favicon_service->GetFaviconForURL(GURL(url), history::FAV_ICON,
+          &fav_icon_consumer_,
           NewCallback(this, &BookmarkFaviconFetcher::OnFavIconDataAvailable));
       return true;
     } else {
@@ -451,17 +452,14 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() {
 
 void BookmarkFaviconFetcher::OnFavIconDataAvailable(
     FaviconService::Handle handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedMemory> data,
-    bool expired,
-    GURL icon_url) {
+    history::FaviconData favicon) {
   GURL url;
   if (!bookmark_urls_.empty()) {
     url = GURL(bookmark_urls_.front());
     bookmark_urls_.pop_front();
   }
-  if (know_favicon && data.get() && data->size() && !url.is_empty()) {
-    favicons_map_->insert(make_pair(url.spec(), data));
+  if (favicon.is_valid() && !url.is_empty()) {
+    favicons_map_->insert(make_pair(url.spec(), favicon.image_data));
   }
 
   if (FetchNextFavicon()) {