Fix leaking page visits in incognito mode via bookmarked favicons

components/favicon/content/content_favicon_driver.h

 // 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.
 
 #ifndef COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_
 #define COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "components/favicon/core/favicon_driver_impl.h"
@@ skipping 15 matching lines @@
 // favicon download has completed.
 class ContentFaviconDriver
     : public content::WebContentsObserver,
       public content::WebContentsUserData<ContentFaviconDriver>,
       public FaviconDriverImpl {
  public:
   ~ContentFaviconDriver() override;
 
   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.
   std::vector<content::FaviconURL> favicon_urls() const {
     return favicon_urls_.value_or(std::vector<content::FaviconURL>());
   }
 
   // Saves the favicon for the last committed navigation entry to the thumbnail
   // database.
-  void SaveFavicon();
+  void SaveFaviconEvenIfInIncognito();
 
   // FaviconDriver implementation.
   gfx::Image GetFavicon() const override;
   bool FaviconIsValid() const override;
   GURL GetActiveURL() override;
 
  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>;
 
   // FaviconHandler::Delegate implementation.
   int DownloadImage(const GURL& url,
                     int max_image_size,
                     ImageDownloadCallback callback) override;
   void DownloadManifest(const GURL& url,
                         ManifestDownloadCallback callback) override;
@@ skipping 19 matching lines @@
   base::Optional<std::vector<content::FaviconURL>> favicon_urls_;
   // Web Manifest URL or empty URL if none.
   GURL manifest_url_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentFaviconDriver);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_