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..15caf57f02bca3e27b172c8cf0a404c408a0da66 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -439,7 +439,10 @@ 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),

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

Generally folks put as many args on a line as will fit.

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

Done.

+          history::FAV_ICON,
+          &fav_icon_consumer_,
           NewCallback(this, &BookmarkFaviconFetcher::OnFavIconDataAvailable));
       return true;
     } else {
@@ -454,7 +457,8 @@ void BookmarkFaviconFetcher::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]

From the style guide: 'All parameters should be named, with identical names in
the declaration and implementation.'

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

Done.

   GURL url;
   if (!bookmark_urls_.empty()) {
     url = GURL(bookmark_urls_.front());