Start PopularSites fetch from separate function.

components/ntp_tiles/most_visited_sites.cc

 // Copyright 2013 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 <algorithm>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 133 matching lines @@
 
 MostVisitedSites::Suggestion::~Suggestion() {}
 
 MostVisitedSites::Suggestion::Suggestion(Suggestion&&) = default;
 MostVisitedSites::Suggestion&
 MostVisitedSites::Suggestion::operator=(Suggestion&&) = default;
 
 MostVisitedSites::MostVisitedSites(
     scoped_refptr<base::SequencedWorkerPool> blocking_pool,
     PrefService* prefs,
-    const TemplateURLService* template_url_service,
-    variations::VariationsService* variations_service,
-    net::URLRequestContextGetter* download_context,
-    const base::FilePath& popular_sites_directory,
     scoped_refptr<history::TopSites> top_sites,
     SuggestionsService* suggestions,
+    PopularSites* popular_sites,
     MostVisitedSitesSupervisor* supervisor)
     : prefs_(prefs),
-      template_url_service_(template_url_service),
-      variations_service_(variations_service),
-      download_context_(download_context),
-      popular_sites_directory_(popular_sites_directory),
       top_sites_(top_sites),
       suggestions_service_(suggestions),
+      popular_sites_(popular_sites),
       supervisor_(supervisor),
       observer_(nullptr),
       num_sites_(0),
       received_most_visited_sites_(false),
       received_popular_sites_(false),
       recorded_uma_(false),
       scoped_observer_(this),
       mv_source_(SUGGESTIONS_SERVICE),
-      blocking_pool_(std::move(blocking_pool)),
-      blocking_runner_(blocking_pool_->GetTaskRunnerWithShutdownBehavior(
+      blocking_runner_(blocking_pool->GetTaskRunnerWithShutdownBehavior(
           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN)),
       weak_ptr_factory_(this) {
   DCHECK(suggestions_service_);
   supervisor_->SetObserver(this);
 }
 
 MostVisitedSites::~MostVisitedSites() {
   supervisor_->SetObserver(nullptr);
 }
 
 #if defined(OS_ANDROID)
 // static
 bool MostVisitedSites::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 #endif
 
 void MostVisitedSites::SetMostVisitedURLsObserver(Observer* observer,
                                                   int num_sites) {
   DCHECK(observer);
   observer_ = observer;
   num_sites_ = num_sites;
 
-  if (ShouldShowPopularSites() && NeedPopularSites(prefs_, num_sites_)) {
-    popular_sites_.reset(new PopularSites(
-        blocking_pool_, prefs_, template_url_service_, variations_service_,
-        download_context_, popular_sites_directory_, false,
-        base::Bind(&MostVisitedSites::OnPopularSitesAvailable,
-                   base::Unretained(this))));
+  if (popular_sites_ && ShouldShowPopularSites() &&
+      NeedPopularSites(prefs_, num_sites_)) {
+    popular_sites_->StartFetch(
+        false, base::Bind(&MostVisitedSites::OnPopularSitesAvailable,
+                          base::Unretained(this)));
   } else {
     received_popular_sites_ = true;
   }
 
   if (top_sites_) {
     // TopSites updates itself after a delay. To ensure up-to-date results,
     // force an update now.
     top_sites_->SyncWithHistory();
 
     // Register as TopSitesObserver so that we can update ourselves when the
@@ skipping 350 matching lines @@
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == TOP_SITES) {
     // The displayed suggestions are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles