Fix leaking page visits in incognito mode via bookmarked favicons

components/favicon/content/content_favicon_driver.cc

Index: components/favicon/content/content_favicon_driver.cc
diff --git a/components/favicon/content/content_favicon_driver.cc b/components/favicon/content/content_favicon_driver.cc
index 97d3501077eeb2a5c8eb57f1b4133a2172fea8b6..c646c6df8211899cabbac64e2b5fdde3b901378d 100644
--- a/components/favicon/content/content_favicon_driver.cc
+++ b/components/favicon/content/content_favicon_driver.cc
@@ -43,18 +43,16 @@ void ExtractManifestIcons(
 void ContentFaviconDriver::CreateForWebContents(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
-    history::HistoryService* history_service,
-    bookmarks::BookmarkModel* bookmark_model) {
+    history::HistoryService* history_service) {
   if (FromWebContents(web_contents))
     return;
 
   web_contents->SetUserData(
-      UserDataKey(),
-      base::WrapUnique(new ContentFaviconDriver(
-          web_contents, favicon_service, history_service, bookmark_model)));
+      UserDataKey(), base::WrapUnique(new ContentFaviconDriver(
+                         web_contents, favicon_service, history_service)));
 }
 
-void ContentFaviconDriver::SaveFavicon() {
+void ContentFaviconDriver::SaveFaviconEvenIfInIncognito() {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   if (!entry)
@@ -115,11 +113,9 @@ GURL ContentFaviconDriver::GetActiveURL() {
 ContentFaviconDriver::ContentFaviconDriver(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
-    history::HistoryService* history_service,
-    bookmarks::BookmarkModel* bookmark_model)
+    history::HistoryService* history_service)
     : content::WebContentsObserver(web_contents),
-      FaviconDriverImpl(favicon_service, history_service, bookmark_model) {
-}
+      FaviconDriverImpl(favicon_service, history_service) {}
 
 ContentFaviconDriver::~ContentFaviconDriver() {
 }