ntp_tiles: Fix Top Sites potentially overriding Suggestions Service

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 333 matching lines @@
     EXPECT_FALSE(suggestions_service_callbacks_.empty());
     EXPECT_FALSE(top_sites_callbacks_.empty());
   }
 };
 
 TEST_F(MostVisitedSitesWithEmptyCacheTest,
        ShouldQueryTopSitesAndSuggestionsService) {
   // Constructor sets basic expectations for a suggestions service cache miss.
 }
 
-// TODO(mastiz): This describes the current behavior but it actually is a bug.
 TEST_F(MostVisitedSitesWithEmptyCacheTest,
-       DoesNotIgnoreTopSitesIfSuggestionsServiceFaster) {
+       ShouldIgnoreTopSitesIfSuggestionsServiceFaster) {
   // Reply from suggestions service triggers and update to our observer.
   EXPECT_CALL(
       mock_observer_,
       OnMostVisitedURLsAvailable(ElementsAre(MatchesTile(
           "Site 1", "http://site1/", NTPTileSource::SUGGESTIONS_SERVICE))));
   suggestions_service_callbacks_.Notify(
       MakeProfile({MakeSuggestion("Site 1", "http://site1/")}));
   VerifyAndClearExpectations();
 
-  // Reply from top sites is currently not ignored (i.e. is actually reported to
-  // observer).
-  EXPECT_CALL(mock_observer_,
-              OnMostVisitedURLsAvailable(ElementsAre(MatchesTile(
-                  "Site 2", "http://site2/", NTPTileSource::TOP_SITES))));
+  // 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.
@@ skipping 149 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