Fix leaking page visits in incognito mode via bookmarked favicons

components/favicon/content/content_favicon_driver.cc

 // Copyright 2015 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.
 
 #include "components/favicon/content/content_favicon_driver.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_service.h"
@@ skipping 25 matching lines @@
   }
   callback.Run(candidates);
 }
 
 }  // namespace
 
 // static
 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)
     return;
 
   // Make sure the page is in history, otherwise adding the favicon does
   // nothing.
   if (!history_service())
     return;
   GURL page_url = entry->GetURL();
@@ skipping 40 matching lines @@
 
 GURL ContentFaviconDriver::GetActiveURL() {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   return entry ? entry->GetURL() : GURL();
 }
 
 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() {
 }
 
 int ContentFaviconDriver::DownloadImage(const GURL& url,
                                         int max_image_size,
                                         ImageDownloadCallback callback) {
   bool bypass_cache = (bypass_cache_page_url_ == GetActiveURL());
   bypass_cache_page_url_ = GURL();
 
@@ skipping 108 matching lines @@
   // redownloaded.
   GURL url = navigation_handle->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url, navigation_handle->IsSameDocument());
 }
 
 }  // namespace favicon