Remove default-page favicon for interstitials

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"
@@ skipping 28 matching lines @@
           ->GetOriginalProfile();
   return ContentFaviconDriver::CreateForWebContents(
       web_contents, FaviconServiceFactory::GetForProfile(
                         original_profile, ServiceAccessType::IMPLICIT_ACCESS),
       HistoryServiceFactory::GetForProfile(original_profile,
                                            ServiceAccessType::IMPLICIT_ACCESS),
       BookmarkModelFactory::GetForBrowserContextIfExists(original_profile));
 }
 
 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 =
       web_contents->GetController();
   if (controller.GetLastCommittedEntry() && controller.GetPendingEntry())
     return true;
 
   GURL url = web_contents->GetURL();
   if (url.SchemeIs(content::kChromeUIScheme) &&
       url.host_piece() == chrome::kChromeUINewTabHost) {
     return false;
@@ skipping 23 matching lines @@
                                 kDesaturateLightness};
       return gfx::Image(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
           *favicon.ToImageSkia(), shift));
     }
   }
 
   return favicon;
 }
 
 }  // namespace favicon