Fix leaking page visits in incognito mode via bookmarked favicons

components/favicon/ios/web_favicon_driver.mm

 // 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/ios/web_favicon_driver.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/favicon/core/favicon_url.h"
@@ skipping 20 matching lines @@
                         const GURL& image_url,
                         const std::vector<SkBitmap>& bitmaps,
                         const std::vector<gfx::Size>& sizes)>;
 
 namespace favicon {
 
 // static
 void WebFaviconDriver::CreateForWebState(
     web::WebState* web_state,
     FaviconService* favicon_service,
-    history::HistoryService* history_service,
-    bookmarks::BookmarkModel* bookmark_model) {
+    history::HistoryService* history_service) {
   if (FromWebState(web_state))
     return;
 
-  web_state->SetUserData(UserDataKey(), base::WrapUnique(new WebFaviconDriver(
-                                            web_state, favicon_service,
-                                            history_service, bookmark_model)));
+  web_state->SetUserData(UserDataKey(),
+                         base::WrapUnique(new WebFaviconDriver(
+                             web_state, favicon_service, history_service)));
 }
 
 void WebFaviconDriver::FetchFavicon(const GURL& page_url,
                                     bool is_same_document) {
   fetch_favicon_url_ = page_url;
   FaviconDriverImpl::FetchFavicon(page_url, is_same_document);
 }
 
 gfx::Image WebFaviconDriver::GetFavicon() const {
   web::NavigationItem* item =
@@ skipping 67 matching lines @@
       web_state()->GetNavigationManager()->GetVisibleItem();
   if (!item || item->GetURL() != page_url)
     return;
 
   NotifyFaviconUpdatedObservers(notification_icon_type, icon_url,
                                 icon_url_changed, image);
 }
 
 WebFaviconDriver::WebFaviconDriver(web::WebState* web_state,
                                    FaviconService* favicon_service,
-                                   history::HistoryService* history_service,
-                                   bookmarks::BookmarkModel* bookmark_model)
+                                   history::HistoryService* history_service)
     : web::WebStateObserver(web_state),
-      FaviconDriverImpl(favicon_service, history_service, bookmark_model),
+      FaviconDriverImpl(favicon_service, history_service),
       image_fetcher_(web_state->GetBrowserState()->GetRequestContext()) {}
 
 WebFaviconDriver::~WebFaviconDriver() {
 }
 
 void WebFaviconDriver::FaviconUrlUpdated(
     const std::vector<web::FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   OnUpdateCandidates(GetActiveURL(), FaviconURLsFromWebFaviconURLs(candidates),
                      GURL());
 }
 
 }  // namespace favicon