Add baked-in favicons for default popular sites on NTP

chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.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 "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/ntp_tiles/chrome_popular_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/image_decoder_impl.h"
 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/image_fetcher/image_fetcher_impl.h"
 #include "components/ntp_tiles/icon_cacher_impl.h"
 #include "components/ntp_tiles/metrics.h"
 #include "components/ntp_tiles/most_visited_sites.h"
+#include "components/ntp_tiles/popular_sites_impl.h"
 
 using suggestions::SuggestionsServiceFactory;
 
 namespace {
 
 class SupervisorBridge : public ntp_tiles::MostVisitedSitesSupervisor,
                          public SupervisedUserServiceObserver {
  public:
   explicit SupervisorBridge(Profile* profile);
   ~SupervisorBridge() override;
@@ skipping 67 matching lines @@
 }  // namespace
 
 // static
 std::unique_ptr<ntp_tiles::MostVisitedSites>
 ChromeMostVisitedSitesFactory::NewForProfile(Profile* profile) {
   // MostVisitedSites doesn't exist in incognito profiles.
   if (profile->IsOffTheRecord()) {
     return nullptr;
   }
 
-  return base::MakeUnique<ntp_tiles::MostVisitedSites>(
-      profile->GetPrefs(), TopSitesFactory::GetForProfile(profile),
-      SuggestionsServiceFactory::GetForProfile(profile),
-#if defined(OS_ANDROID)
-      ChromePopularSitesFactory::NewForProfile(profile),
-#else
-      nullptr,
-#endif
+  std::unique_ptr<ntp_tiles::IconCacher> icon_cacher =
       base::MakeUnique<ntp_tiles::IconCacherImpl>(
           FaviconServiceFactory::GetForProfile(
               profile, ServiceAccessType::IMPLICIT_ACCESS),
           base::MakeUnique<image_fetcher::ImageFetcherImpl>(
               base::MakeUnique<suggestions::ImageDecoderImpl>(),
-              profile->GetRequestContext())),
+              profile->GetRequestContext()));
+
+  std::unique_ptr<ntp_tiles::PopularSites> popular_sites = nullptr;
+#if defined(OS_ANDROID)
+  popular_sites = ChromePopularSitesFactory::NewForProfile(profile);
+  ntp_tiles::PopularSitesImpl::AddIconsForDefaultPagesToCacher(
+      *profile->GetPrefs(), icon_cacher.get());
+#endif
+
+  return base::MakeUnique<ntp_tiles::MostVisitedSites>(
+      profile->GetPrefs(), TopSitesFactory::GetForProfile(profile),
+      SuggestionsServiceFactory::GetForProfile(profile),
+      std::move(popular_sites), std::move(icon_cacher),
       base::MakeUnique<SupervisorBridge>(profile));
 }