Start PopularSites fetch from separate function.

components/ntp_tiles/popular_sites.h

 // 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.
 
 #ifndef COMPONENTS_NTP_TILES_POPULAR_SITES_H_
 #define COMPONENTS_NTP_TILES_POPULAR_SITES_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
 
     base::string16 title;
     GURL url;
     GURL favicon_url;
     GURL large_icon_url;
     GURL thumbnail_url;
   };
 
   using FinishedCallback = base::Callback<void(bool /* success */)>;
 
-  // When the suggestions have been fetched (from cache or URL) and parsed,
-  // invokes |callback|, on the same thread as the caller.
-  //
-  // Set |force_download| to enforce re-downloading the suggestions file, even
-  // if it already exists on disk.
   PopularSites(const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
                PrefService* prefs,
                const TemplateURLService* template_url_service,
                variations::VariationsService* variations_service,
                net::URLRequestContextGetter* download_context,
-               const base::FilePath& directory,
-               bool force_download,
-               const FinishedCallback& callback);
+               const base::FilePath& directory);
+
+  // Starts the process of retrieving popular sites. When they are available,
+  // invokes |callback| with the result, on the same thread as the caller. Never
+  // invokes |callback| before returning control to the caller, even if the
+  // result is immediately known.
+  //
+  // Set |force_download| to enforce re-downloading the suggestions file, even
+  // if it already exists on disk.
+  void StartFetch(bool force_download, const FinishedCallback& callback);

[Marc Treib, 2016/07/26 13:46:22]

It is legal to call this multiple times? I suppose not. I'd add that to the
comment, and if possible DCHECK in the implementation.

[sfiera, 2016/07/26 13:56:54]

No, done, and done.

 
   ~PopularSites() override;
 
   const std::vector<Site>& sites() const { return sites_; }
 
   // The URL of the file that was last downloaded.
   GURL LastURL() const;
 
   const base::FilePath& local_path() const { return local_path_; }
 
@@ skipping 10 matching lines @@
 
   // net::URLFetcherDelegate implementation.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   void OnJsonParsed(std::unique_ptr<base::Value> json);
   void OnJsonParseFailed(const std::string& error_message);
   void OnFileWriteDone(std::unique_ptr<base::Value> json, bool success);
   void ParseSiteList(std::unique_ptr<base::Value> json);
   void OnDownloadFailed();
 
+  // Parameters set from constructor.
+  scoped_refptr<base::TaskRunner> const blocking_runner_;
+  PrefService* const prefs_;
+  const TemplateURLService* const template_url_service_;
+  variations::VariationsService* const variations_;
+  net::URLRequestContextGetter* const download_context_;
+  base::FilePath const local_path_;
+
+  // Set by StartFetch() and called after fetch completes.
   FinishedCallback callback_;
+
   std::unique_ptr<net::URLFetcher> fetcher_;
   bool is_fallback_;
   std::vector<Site> sites_;
   GURL pending_url_;
 
-  base::FilePath local_path_;
-
-  PrefService* prefs_;
-  net::URLRequestContextGetter* download_context_;
-
-  scoped_refptr<base::TaskRunner> blocking_runner_;
-
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 }  // namespace ntp_tiles
 
 #endif  // COMPONENTS_NTP_TILES_POPULAR_SITES_H_