Add baked-in favicons for default popular sites on NTP

components/ntp_tiles/icon_cacher_impl.cc

 // Copyright 2016 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/icon_cacher_impl.h"
 
 #include <utility>
 
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_util.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/image_fetcher/image_fetcher.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace ntp_tiles {
 
 namespace {
 
 favicon_base::IconType IconType(const PopularSites::Site& site) {
   return site.large_icon_url.is_valid() ? favicon_base::TOUCH_ICON
                                         : favicon_base::FAVICON;
@@ skipping 28 matching lines @@
 
 void IconCacherImpl::OnGetFaviconImageForPageURLFinished(
     PopularSites::Site site,
     const base::Callback<void(bool)>& done,
     const favicon_base::FaviconImageResult& result) {
   if (!result.image.IsEmpty()) {
     done.Run(false);
     return;
   }
 
+  if (ProvideDefaultIcon(site)) {
+    done.Run(true);
+    // Don't return. We want to fetch to update possibly stale images.
+  }
+
   image_fetcher_->StartOrQueueNetworkRequest(
       std::string(), IconURL(site),
       base::Bind(&IconCacherImpl::OnFaviconDownloaded, base::Unretained(this),
                  site, done));
 }
 
 void IconCacherImpl::OnFaviconDownloaded(PopularSites::Site site,
                                          const base::Callback<void(bool)>& done,
                                          const std::string& id,
                                          const gfx::Image& fetched_image) {
   if (fetched_image.IsEmpty()) {
     done.Run(false);
     return;
   }
 
-  gfx::Image image = fetched_image;
-  favicon_base::SetFaviconColorSpace(&image);
-  favicon_service_->SetFavicons(site.url, IconURL(site), IconType(site), image);
+  SaveIconForSite(site, fetched_image);
   done.Run(true);
 }
 
+void IconCacherImpl::SaveIconForSite(const PopularSites::Site& site,
+                                     gfx::Image image) {
+  favicon_base::SetFaviconColorSpace(&image);
+  favicon_service_->SetFavicons(site.url, IconURL(site), IconType(site), image);
+}
+
+bool IconCacherImpl::ProvideDefaultIcon(const PopularSites::Site& site) {
+  if (site.default_resource_id < 0) {
+    return false;
+  }
+  SaveIconForSite(site, ResourceBundle::GetSharedInstance().GetImageNamed(
+                            site.default_resource_id));
+  return true;
+}
+
 }  // namespace ntp_tiles