Applied the IconType.

chrome/browser/bookmarks/bookmark_html_writer.cc

 // Copyright (c) 2011 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/bookmarks/bookmark_html_writer.h"
 
 #include "base/base64.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
@@ skipping 421 matching lines @@
   if (bookmark_urls_.empty()) {
     return false;
   }
   do {
     std::string url = bookmark_urls_.front();
     // Filter out urls that we've already got favicon for.
     URLFaviconMap::const_iterator iter = favicons_map_->find(url);
     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 {
       bookmark_urls_.pop_front();
     }
   } while (!bookmark_urls_.empty());
   return false;
 }
 
 void BookmarkFaviconFetcher::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     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());
     bookmark_urls_.pop_front();
   }
   if (know_favicon && data.get() && data->size() && !url.is_empty()) {
     favicons_map_->insert(make_pair(url.spec(), data));
   }
 
   if (FetchNextFavicon()) {
@@ skipping 10 matching lines @@
   // BookmarkModel isn't thread safe (nor would we want to lock it down
   // for the duration of the write), as such we make a copy of the
   // BookmarkModel using BookmarkCodec then write from that.
   if (fetcher == NULL) {
     fetcher = new BookmarkFaviconFetcher(profile, path, observer);
     fetcher->ExportBookmarks();
   }
 }
 
 }  // namespace bookmark_html_writer