Add baked-in favicons for default popular sites on NTP

components/ntp_tiles/most_visited_sites.cc

 // Copyright 2013 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/ntp_tiles/most_visited_sites.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 341 matching lines @@
       // Skip tiles already present in personal or whitelists.
       if (hosts.find(host) != hosts.end())
         continue;
 
       NTPTile tile;
       tile.title = popular_site.title;
       tile.url = GURL(popular_site.url);
       tile.source = NTPTileSource::POPULAR;
 
       popular_sites_tiles.push_back(std::move(tile));
-      icon_cacher_->StartFetch(
-          popular_site, base::Bind(&MostVisitedSites::OnIconMadeAvailable,
-                                   base::Unretained(this), popular_site.url));
+      base::Closure icon_available =
+          base::Bind(&MostVisitedSites::OnIconMadeAvailable,
+                     base::Unretained(this), popular_site.url);
+      icon_cacher_->StartFetch(popular_site, icon_available, icon_available);
       if (popular_sites_tiles.size() >= num_popular_sites_tiles)
         break;
     }
   }
   return popular_sites_tiles;
 }
 
 void MostVisitedSites::SaveNewTiles(NTPTilesVector personal_tiles) {
   NTPTilesVector whitelist_tiles =
       CreateWhitelistEntryPointTiles(personal_tiles);
@@ skipping 38 matching lines @@
   observer_->OnMostVisitedURLsAvailable(current_tiles_);
 }
 
 void MostVisitedSites::OnPopularSitesDownloaded(bool success) {
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 }
 
-void MostVisitedSites::OnIconMadeAvailable(const GURL& site_url,
-                                           bool newly_available) {
-  if (newly_available)
-    observer_->OnIconMadeAvailable(site_url);
+void MostVisitedSites::OnIconMadeAvailable(const GURL& site_url) {
+  observer_->OnIconMadeAvailable(site_url);
 }
 
 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {}
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == NTPTileSource::TOP_SITES) {
     // The displayed tiles are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles