Add baked-in favicons for default popular sites on NTP

components/ntp_tiles/most_visited_sites_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include <memory>
 #include <ostream>
@@ skipping 175 matching lines @@
 };
 
 class MockMostVisitedSitesObserver : public MostVisitedSites::Observer {
  public:
   MOCK_METHOD1(OnMostVisitedURLsAvailable, void(const NTPTilesVector& tiles));
   MOCK_METHOD1(OnIconMadeAvailable, void(const GURL& site_url));
 };
 
 class MockIconCacher : public IconCacher {
  public:
-  MOCK_METHOD2(StartFetch,
+  MOCK_METHOD3(StartFetch,
                void(PopularSites::Site site,
-                    const base::Callback<void(bool)>& done));
+                    const base::Closure& icon_available,
+                    const base::Closure& preliminary_icon_available));
 };
 
 class PopularSitesFactoryForTest {
  public:
   PopularSitesFactoryForTest(
       bool enabled,
       sync_preferences::TestingPrefServiceSyncable* pref_service)
       : prefs_(pref_service),
         url_fetcher_factory_(/*default_factory=*/nullptr),
         url_request_context_(new net::TestURLRequestContextGetter(
@@ skipping 95 matching lines @@
               },
               &save_success, &loop));
       loop.Run();
       EXPECT_TRUE(save_success);
 
       // With PopularSites enabled, blacklist is exercised.
       EXPECT_CALL(*mock_top_sites_, IsBlacklisted(_))
           .WillRepeatedly(Return(false));
       // Mock icon cacher never replies, and we also don't verify whether the
       // code uses it correctly.
-      EXPECT_CALL(*icon_cacher, StartFetch(_, _)).Times(AtLeast(0));
+      EXPECT_CALL(*icon_cacher, StartFetch(_, _, _)).Times(AtLeast(0));
     }
 
     most_visited_sites_ = base::MakeUnique<MostVisitedSites>(
         &pref_service_, mock_top_sites_, &mock_suggestions_service_,
         popular_sites_factory_.New(), std::move(icon_cacher),
         /*supervisor=*/nullptr);
   }
 
   bool IsPopularSitesEnabledViaVariations() const { return GetParam(); }
 
@@ skipping 550 matching lines @@
                   MatchesTile("Site 4", "https://www.site4.com/",
                               NTPTileSource::TOP_SITES),
                   MatchesTile("Site 1", "https://www.site1.com/",
                               NTPTileSource::POPULAR),
                   MatchesTile("Site 2", "https://www.site2.com/",
                               NTPTileSource::POPULAR)));
 }
 
 }  // namespace
 }  // namespace ntp_tiles