Fix leaking page visits in incognito mode via bookmarked favicons

chrome/browser/favicon/favicon_utils.cc

 // Copyright (c) 2012 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 "chrome/browser/favicon/favicon_utils.h"
 
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/url_constants.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/favicon_url.h"
 #include "ui/gfx/image/image.h"
@@ skipping 13 matching lines @@
 void CreateContentFaviconDriverForWebContents(
     content::WebContents* web_contents) {
   DCHECK(web_contents);
   if (ContentFaviconDriver::FromWebContents(web_contents))
     return;
 
   Profile* original_profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext())
           ->GetOriginalProfile();
   return ContentFaviconDriver::CreateForWebContents(
-      web_contents, FaviconServiceFactory::GetForProfile(
-                        original_profile, ServiceAccessType::IMPLICIT_ACCESS),
+      web_contents,
+      FaviconServiceFactory::GetForProfile(original_profile,
+                                           ServiceAccessType::IMPLICIT_ACCESS),
       HistoryServiceFactory::GetForProfile(original_profile,
-                                           ServiceAccessType::IMPLICIT_ACCESS),
-      BookmarkModelFactory::GetForBrowserContextIfExists(original_profile));
+                                           ServiceAccessType::IMPLICIT_ACCESS));
 }
 
 bool ShouldDisplayFavicon(content::WebContents* web_contents) {
   // No favicon on interstitials. This check must be done first since
   // interstitial navigations don't commit and always have a pending entry.
   if (web_contents->ShowingInterstitialPage())
     return false;
 
   // Always display a throbber during pending loads.
   const content::NavigationController& controller =
@@ skipping 31 matching lines @@
                                 kDesaturateLightness};
       return gfx::Image(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
           *favicon.ToImageSkia(), shift));
     }
   }
 
   return favicon;
 }
 
 }  // namespace favicon