Fix leaking page visits in incognito mode via bookmarked favicons

components/favicon/core/favicon_driver_impl.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/core/favicon_driver_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
-#include "components/bookmarks/browser/bookmark_model.h"
 #include "components/favicon/core/favicon_driver_observer.h"
 #include "components/favicon/core/favicon_handler.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/history/core/browser/history_service.h"
 
 namespace favicon {
 namespace {
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
@@ skipping 18 matching lines @@
   UMA_HISTOGRAM_COUNTS_100("Favicons.CandidatesCount", candidates.size());
   UMA_HISTOGRAM_COUNTS_100("Favicons.CandidatesWithDefinedSizesCount",
                            with_defined_sizes);
   UMA_HISTOGRAM_COUNTS_100("Favicons.CandidatesWithTouchIconsCount",
                            with_defined_touch_icons);
 }
 
 }  // namespace
 
 FaviconDriverImpl::FaviconDriverImpl(FaviconService* favicon_service,
-                                     history::HistoryService* history_service,
-                                     bookmarks::BookmarkModel* bookmark_model)
-    : favicon_service_(favicon_service),
-      history_service_(history_service),
-      bookmark_model_(bookmark_model) {
+                                     history::HistoryService* history_service)
+    : favicon_service_(favicon_service), history_service_(history_service) {
   if (!favicon_service_)
     return;
 
   if (kEnableTouchIcon) {
     handlers_.push_back(base::MakeUnique<FaviconHandler>(
         favicon_service_, this, FaviconDriverObserver::NON_TOUCH_LARGEST));
     handlers_.push_back(base::MakeUnique<FaviconHandler>(
         favicon_service_, this, FaviconDriverObserver::TOUCH_LARGEST));
   } else {
     handlers_.push_back(base::MakeUnique<FaviconHandler>(
         favicon_service_, this, FaviconDriverObserver::NON_TOUCH_16_DIP));
   }
 }
 
 FaviconDriverImpl::~FaviconDriverImpl() {
 }
 
 void FaviconDriverImpl::FetchFavicon(const GURL& page_url,
                                      bool is_same_document) {
   for (const std::unique_ptr<FaviconHandler>& handler : handlers_)
     handler->FetchFavicon(page_url, is_same_document);
 }
 
-bool FaviconDriverImpl::IsBookmarked(const GURL& url) {
-  return bookmark_model_ && bookmark_model_->IsBookmarked(url);
-}
-
 bool FaviconDriverImpl::HasPendingTasksForTest() {
   for (const std::unique_ptr<FaviconHandler>& handler : handlers_) {
     if (handler->HasPendingTasksForTest())
       return true;
   }
   return false;
 }
 
 void FaviconDriverImpl::SetFaviconOutOfDateForPage(const GURL& url,
                                                    bool force_reload) {
@@ skipping 15 matching lines @@
     // icons override inline touch icons).
     handler->OnUpdateCandidates(
         page_url, candidates,
         handler->icon_types() & favicon_base::WEB_MANIFEST_ICON
             ? manifest_url
             : GURL::EmptyGURL());
   }
 }
 
 }  // namespace favicon