Remove NTP dependency on //content/...

chrome/browser/android/ntp/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 CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_
 #define CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 46 matching lines @@
 
     base::string16 title;
     GURL url;
     GURL favicon_url;
     GURL large_icon_url;
     GURL thumbnail_url;
   };
 
   using FinishedCallback = base::Callback<void(bool /* success */)>;
 
-  // Must only be instantiated on the UI thread. When the suggestions have been
-  // fetched (from cache or URL) and parsed, invokes |callback|, also on the UI
-  // thread.
+  // 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.
   //
   // TODO(treib): PopularSites should query the variation params itself instead
   // of having them passed in.
-  PopularSites(PrefService* prefs,
+  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,
                const std::string& variation_param_country,
                const std::string& variation_param_version,
                bool force_download,
                const FinishedCallback& callback);
 
   // This fetches the popular sites from a given url and is only used for
   // debugging through the popular-sites-internals page.
-  PopularSites(PrefService* prefs,
+  PopularSites(const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
+               PrefService* prefs,
                net::URLRequestContextGetter* download_context,
                const base::FilePath& directory,
                const GURL& url,
                const FinishedCallback& callback);
 
   ~PopularSites() override;
 
   const std::vector<Site>& sites() const { return sites_; }
 
   // The country/version of the file that was last downloaded.
   std::string GetCountry() const;
   std::string GetVersion() const;
 
   const base::FilePath& local_path() const { return local_path_; }
 
   // Register preferences used by this class.
   static void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* user_prefs);
 
  private:
-  PopularSites(PrefService* prefs,
+  PopularSites(const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
+               PrefService* prefs,
                net::URLRequestContextGetter* download_context,
                const base::FilePath& directory,
                const std::string& country,
                const std::string& version,
                const GURL& override_url,
                bool force_download,
                const FinishedCallback& callback);
 
   GURL GetPopularSitesURL() const;
 
@@ skipping 20 matching lines @@
   bool is_fallback_;
   std::vector<Site> sites_;
   std::string pending_country_;
   std::string pending_version_;
 
   base::FilePath local_path_;
 
   PrefService* prefs_;
   net::URLRequestContextGetter* download_context_;
 
-  scoped_refptr<base::TaskRunner> runner_;
+  scoped_refptr<base::TaskRunner> blocking_runner_;
 
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_