Applied the IconType.

chrome/browser/history/history.h

Index: chrome/browser/history/history.h
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index ce0d29e912b82b590fd8a47b691d59b0c7be83d8..872937bc0f1f8139c42f9a439318768b603f0c21 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -643,17 +643,19 @@ class HistoryService : public CancelableRequestProvider,
 
   // Used by the FaviconService to get a favicon from the history backend.
   void GetFavicon(FaviconService::GetFaviconRequest* request,
-                  const GURL& icon_url);
+                  const GURL& icon_url, history::IconType icon_type);

[sky, 2011/03/10 17:54:44]

Once you wrap a function declaration (or definition) put each arg on its own
line.

 
   // Used by the FaviconService to update the favicon mappings on the history
   // backend.
   void UpdateFaviconMappingAndFetch(FaviconService::GetFaviconRequest* request,
                                     const GURL& page_url,
-                                    const GURL& icon_url);
+                                    const GURL& icon_url,
+                                    history::IconType icon_type);
 
   // Used by the FaviconService to get a favicon from the history backend.
   void GetFaviconForURL(FaviconService::GetFaviconRequest* request,
-                        const GURL& page_url);
+                        const GURL& page_url,
+                        int icon_type);

[sky, 2011/03/10 17:54:44]

icon_types

[michaelbai, 2011/03/11 01:11:28]

Done.

 
   // Used by the FaviconService to mark the favicon for the page as being out
   // of date.
@@ -669,7 +671,8 @@ class HistoryService : public CancelableRequestProvider,
   // backend.
   void 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_types);

[sky, 2011/03/10 17:54:44]

icon_type

[michaelbai, 2011/03/11 01:11:28]

Done.

 
 
   // Sets the in-memory URL database. This is called by the backend once the