Applied the IconType.

chrome/browser/history/history.cc

 // Copyright (c) 2010 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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 431 matching lines @@
 
 HistoryService::Handle HistoryService::GetPageThumbnail(
     const GURL& page_url,
     CancelableRequestConsumerBase* consumer,
     ThumbnailDataCallback* callback) {
   return Schedule(PRIORITY_NORMAL, &HistoryBackend::GetPageThumbnail, consumer,
                   new history::GetPageThumbnailRequest(callback), page_url);
 }
 
 void HistoryService::GetFavicon(FaviconService::GetFaviconRequest* request,
-                                const GURL& icon_url) {
+                                const GURL& icon_url,
+                                history::IconType icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIcon, NULL, request,

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

See how there is multiple arguments on a single line here. You should be
consistent and use this style every where.

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

I have gone though the whole CL and kept the style consistent as much as
possible.

-           icon_url, history::FAV_ICON);
+           icon_url, icon_type);
 }
 
 void HistoryService::UpdateFaviconMappingAndFetch(
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url,
-    const GURL& icon_url) {
+    const GURL& icon_url,
+    history::IconType icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::UpdateFavIconMappingAndFetch, NULL,
            request, page_url, icon_url, history::FAV_ICON);
 }
 
 void HistoryService::GetFaviconForURL(
     FaviconService::GetFaviconRequest* request,
-    const GURL& page_url) {
+    const GURL& page_url,
+    int icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIconForURL, NULL, request,
-           page_url, history::FAV_ICON);
+           page_url, icon_type);
 }
 
 void HistoryService::SetFavicon(const GURL& page_url,
                                 const GURL& icon_url,
-                                const std::vector<unsigned char>& image_data) {
+                                const std::vector<unsigned char>& image_data,
+                                history::IconType icon_type) {
   if (!CanAddURL(page_url))
     return;
 
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavIcon,
       page_url, icon_url,
       scoped_refptr<RefCountedMemory>(new RefCountedBytes(image_data)),
-      history::FAV_ICON);
+      icon_type);
 }
 
 void HistoryService::SetFaviconOutOfDateForPage(const GURL& page_url) {
   ScheduleAndForget(PRIORITY_NORMAL,
-                    &HistoryBackend::SetFavIconOutOfDateForPage, page_url);
+                    &HistoryBackend::SetFavIconOutOfDateForPage,
+                    page_url);
 }
 
 void HistoryService::SetImportedFavicons(
     const std::vector<history::ImportedFavIconUsage>& favicon_usage) {
   ScheduleAndForget(PRIORITY_NORMAL,
                     &HistoryBackend::SetImportedFavicons, favicon_usage);
 }
 
 void HistoryService::IterateURLs(URLEnumerator* enumerator) {
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::IterateURLs, enumerator);
@@ skipping 310 matching lines @@
     history::TopSites* ts = profile_->GetTopSitesWithoutCreating();
     if (ts)
       ts->MigrateFromHistory();
   }
 }
 
 void HistoryService::OnTopSitesReady() {
   ScheduleAndForget(PRIORITY_NORMAL,
                     &HistoryBackend::MigrateThumbnailsDatabase);
 }