Applied the IconType.

chrome/browser/history/history.cc

Index: chrome/browser/history/history.cc
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index d74e8893a75cee16463dc90b446270d311d716b8..e2cd08aeb4fd8eb43c0eb71b58b0a374313f7fd3 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -449,41 +449,46 @@ HistoryService::Handle HistoryService::GetPageThumbnail(
 }
 
 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(