[NTP Tiles] Fetch missing MostLikely tiles from a Google server

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 250 matching lines @@
     if (supervisor_ && supervisor_->IsBlocked(url))
       continue;
 
     NTPTile tile;
     tile.title = base::UTF8ToUTF16(suggestion_pb.title());
     tile.url = url;
     tile.source = TileSource::SUGGESTIONS_SERVICE;
     tile.whitelist_icon_path = GetWhitelistLargeIconPath(url);
     tile.thumbnail_url = GURL(suggestion_pb.thumbnail());
     tile.favicon_url = GURL(suggestion_pb.favicon_url());
+    if (AreNtpMostLikelyFaviconsFromServerEnabled()) {
+      icon_cacher_->StartFetchMostLikely(
+          url, base::Bind(&MostVisitedSites::OnIconMadeAvailable,
+                          base::Unretained(this), url));
+    }
 
     tiles.push_back(std::move(tile));
   }
 
   mv_source_ = TileSource::SUGGESTIONS_SERVICE;
   SaveNewTilesAndNotify(std::move(tiles));
 }
 
 NTPTilesVector MostVisitedSites::CreateWhitelistEntryPointTiles(
     const NTPTilesVector& personal_tiles) {
@@ skipping 72 matching lines @@
 
       NTPTile tile;
       tile.title = popular_site.title;
       tile.url = GURL(popular_site.url);
       tile.source = TileSource::POPULAR;
 
       popular_sites_tiles.push_back(std::move(tile));
       base::Closure icon_available =
           base::Bind(&MostVisitedSites::OnIconMadeAvailable,
                      base::Unretained(this), popular_site.url);
-      icon_cacher_->StartFetch(popular_site, icon_available, icon_available);
+      icon_cacher_->StartFetchPopularSites(popular_site, icon_available,
+                                           icon_available);
       if (popular_sites_tiles.size() >= num_popular_sites_tiles)
         break;
     }
   }
   return popular_sites_tiles;
 }
 
 void MostVisitedSites::SaveNewTilesAndNotify(NTPTilesVector personal_tiles) {
   NTPTilesVector whitelist_tiles =
       CreateWhitelistEntryPointTiles(personal_tiles);
@@ skipping 41 matching lines @@
 }
 
 void MostVisitedSites::OnPopularSitesDownloaded(bool success) {
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 
   for (const PopularSites::Site& popular_site : popular_sites_->sites()) {
     // Ignore callback; these icons will be seen on the *next* NTP.
-    icon_cacher_->StartFetch(popular_site, base::Closure(), base::Closure());
+    icon_cacher_->StartFetchPopularSites(popular_site, base::Closure(),
+                                         base::Closure());
   }
 }
 
 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_ == TileSource::TOP_SITES) {
     // The displayed tiles are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles