ntp_tiles: Avoid redundant calls to TopSites

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 353 matching lines @@
 
   // Reply from top sites is ignored (i.e. not reported to observer).
   top_sites_callbacks_.ClearAndNotify(
       {MakeMostVisitedURL("Site 2", "http://site2/")});
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(MostVisitedSitesWithEmptyCacheTest,
        ShouldExposeTopSitesIfSuggestionsServiceFasterButEmpty) {
   // Empty reply from suggestions service causes no update to our observer.
-  // However, the current implementation issues a redundant query to TopSites.
-  // TODO(mastiz): Avoid this redundant call.
-  EXPECT_CALL(*mock_top_sites_, GetMostVisitedURLs(_, false))
-      .WillOnce(Invoke(&top_sites_callbacks_, &TopSitesCallbackList::Add));
   suggestions_service_callbacks_.Notify(SuggestionsProfile());
   VerifyAndClearExpectations();
 
   // Reply from top sites is propagated to observer.
   // TODO(mastiz): Avoid a second redundant call to the observer.
   EXPECT_CALL(mock_observer_,
               OnMostVisitedURLsAvailable(ElementsAre(MatchesTile(
-                  "Site 1", "http://site1/", NTPTileSource::TOP_SITES))))
-      .Times(2);
+                  "Site 1", "http://site1/", NTPTileSource::TOP_SITES))));
   top_sites_callbacks_.ClearAndNotify(
       {MakeMostVisitedURL("Site 1", "http://site1/")});
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(MostVisitedSitesWithEmptyCacheTest,
        ShouldFavorSuggestionsServiceAlthoughSlower) {
   // Reply from top sites is propagated to observer.
   EXPECT_CALL(mock_observer_,
               OnMostVisitedURLsAvailable(ElementsAre(MatchesTile(
@@ skipping 128 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