provide static popular sites for first run

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 185 matching lines @@
                void(PopularSites::Site site,
                     const base::Callback<void(bool)>& done));
 };
 
 class PopularSitesFactoryForTest {
  public:
   PopularSitesFactoryForTest(
       bool enabled,
       sync_preferences::TestingPrefServiceSyncable* pref_service)
       : prefs_(pref_service),
+        enabled_in_variations_(enabled),
         url_fetcher_factory_(/*default_factory=*/nullptr),
         url_request_context_(new net::TestURLRequestContextGetter(
             base::ThreadTaskRunnerHandle::Get())),
         worker_pool_owner_(/*max_threads=*/2, "PopularSitesFactoryForTest.") {
-    if (enabled) {
-      PopularSitesImpl::RegisterProfilePrefs(pref_service->registry());
-
+    PopularSitesImpl::RegisterProfilePrefs(pref_service->registry());
+    if (enabled_in_variations_) {
       prefs_->SetString(prefs::kPopularSitesOverrideCountry, "IN");
       prefs_->SetString(prefs::kPopularSitesOverrideVersion, "7");
 
       url_fetcher_factory_.SetFakeResponse(
           GURL("https://www.gstatic.com/chrome/ntp/suggested_sites_IN_7.json"),
           R"([{
                 "title": "PopularSite1",
                 "url": "http://popularsite1/",
                 "favicon_url": "http://popularsite1/favicon.ico"
               },
               {
                 "title": "PopularSite2",
                 "url": "http://popularsite2/",
                 "favicon_url": "http://popularsite2/favicon.ico"
               },
              ])",
           net::HTTP_OK, net::URLRequestStatus::SUCCESS);
     }
   }
 
   std::unique_ptr<PopularSites> New() {
+    if (!enabled_in_variations_) {

[sfiera, 2017/02/10 10:40:03]

I don't think this change is correct. I think that even when disabled by
variations, popular sites will be non-null. You should change
CreatePopularSitesTiles() to check variations and leave the test unchanged.

[fhorschig, 2017/02/13 10:34:13]

Undone. The whole file is untouched.
The problem was not calling popular sites but constructing it.

+      return nullptr;
+    }
     return base::MakeUnique<PopularSitesImpl>(
         worker_pool_owner_.pool().get(), prefs_,
         /*template_url_service=*/nullptr,
         /*variations_service=*/nullptr, url_request_context_.get(),
         /*directory=*/base::FilePath(), base::Bind(JsonUnsafeParser::Parse));
   }
 
  private:
   PrefService* prefs_;
+  bool enabled_in_variations_;
   net::FakeURLFetcherFactory url_fetcher_factory_;
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_;
   base::SequencedWorkerPoolOwner worker_pool_owner_;
 };
 
 // CallbackList-like container without Subscription, mimicking the
 // implementation in TopSites (which doesn't use base::CallbackList).
 class TopSitesCallbackList {
  public:
   // Second argument declared to match the signature of GetMostVisitedURLs().
@@ skipping 552 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