Fix leaking page visits in incognito mode via bookmarked favicons

components/favicon/content/content_favicon_driver.h

Index: components/favicon/content/content_favicon_driver.h
diff --git a/components/favicon/content/content_favicon_driver.h b/components/favicon/content/content_favicon_driver.h
index b768e033ed6aee781ec1462d0fe1a19bd60c2e45..1f8c90bcb008faefa833da2e67080a472099b32b 100644
--- a/components/favicon/content/content_favicon_driver.h
+++ b/components/favicon/content/content_favicon_driver.h
@@ -33,8 +33,7 @@ class ContentFaviconDriver
 
   static void CreateForWebContents(content::WebContents* web_contents,
                                    FaviconService* favicon_service,
-                                   history::HistoryService* history_service,
-                                   bookmarks::BookmarkModel* bookmark_model);
+                                   history::HistoryService* history_service);
 
   // Returns the current tab's favicon URLs. If this is empty,
   // DidUpdateFaviconURL has not yet been called for the current navigation.
@@ -44,7 +43,7 @@ class ContentFaviconDriver
 
   // Saves the favicon for the last committed navigation entry to the thumbnail
   // database.
-  void SaveFavicon();
+  void SaveFaviconEvenIfInIncognito();
 
   // FaviconDriver implementation.
   gfx::Image GetFavicon() const override;
@@ -54,8 +53,7 @@ class ContentFaviconDriver
  protected:
   ContentFaviconDriver(content::WebContents* web_contents,
                        FaviconService* favicon_service,
-                       history::HistoryService* history_service,
-                       bookmarks::BookmarkModel* bookmark_model);
+                       history::HistoryService* history_service);
 
  private:
   friend class content::WebContentsUserData<ContentFaviconDriver>;