Remove PopularSites' dependencies on //chrome/....

chrome/browser/android/ntp/popular_sites.h

Index: chrome/browser/android/ntp/popular_sites.h
diff --git a/chrome/browser/android/ntp/popular_sites.h b/chrome/browser/android/ntp/popular_sites.h
index a69bbb6a56edaa445f9280789705db663d8cec5a..aafecc9f861525e5314dad13865185b02c21e62b 100644
--- a/chrome/browser/android/ntp/popular_sites.h
+++ b/chrome/browser/android/ntp/popular_sites.h
@@ -14,7 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/net/file_downloader.h"
+#include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 namespace net {
@@ -35,7 +35,7 @@ class TemplateURLService;
 // Downloads and provides a list of suggested popular sites, for display on
 // the NTP when there are not enough personalized suggestions. Caches the
 // downloaded file on disk to avoid re-downloading on every startup.
-class PopularSites {
+class PopularSites : public net::URLFetcherDelegate {
  public:
   struct Site {
     Site(const base::string16& title,
@@ -63,6 +63,7 @@ class PopularSites {
                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,
@@ -73,10 +74,11 @@ class PopularSites {
   PopularSites(PrefService* prefs,
                const TemplateURLService* template_url_service,
                net::URLRequestContextGetter* download_context,
+               const base::FilePath& directory,
                const GURL& url,
                const FinishedCallback& callback);
 
-  ~PopularSites();
+  ~PopularSites() override;
 
   const std::vector<Site>& sites() const { return sites_; }
 
@@ -94,6 +96,7 @@ class PopularSites {
   PopularSites(PrefService* prefs,
                const TemplateURLService* template_url_service,
                net::URLRequestContextGetter* download_context,
+               const base::FilePath& directory,
                const std::string& country,
                const std::string& version,
                const GURL& override_url,
@@ -102,21 +105,28 @@ class PopularSites {
 
   GURL GetPopularSitesURL() const;
 
-  // Fetch the popular sites at the given URL. |force_download| should be true
-  // if any previously downloaded site list should be overwritten.
-  void FetchPopularSites(const GURL& url,
-                         bool force_download,
-                         bool is_fallback);
+  // Fetch the popular sites at the given URL, overwriting any file that already
+  // exists.
+  void FetchPopularSites(const GURL& url);
 
-  // If the download was not successful and it was not a fallback, attempt to
-  // download the fallback suggestions.
-  void OnDownloadDone(bool is_fallback, FileDownloader::Result result);
+  void OnDownloadFailed();
+  void OnReadFileDone(const GURL& url,
+                      std::unique_ptr<std::string> data,
+                      bool success);
 
-  void ParseSiteList(const base::FilePath& path);
+  // net::URLFetcherDelegate implementation.
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
+
+  void OnJsonSanitized(const std::string& valid_minified_json);
+  void OnJsonSanitizationFailed(const std::string& error_message);
+  void OnFileWriteDone(const std::string& json, bool success);

[Marc Treib, 2016/05/11 10:20:29]

nit: "OnReadFileDone" vs "OnFileWriteDone"

Also, could you reorder all of these callbacks into (roughly) chronological
order?

+
+  void ParseSiteList(const std::string& json);
   void OnJsonParsed(std::unique_ptr<std::vector<Site>> sites);
 
   FinishedCallback callback_;
-  std::unique_ptr<FileDownloader> downloader_;
+  std::unique_ptr<net::URLFetcher> fetcher_;
+  bool is_fallback_;
   std::vector<Site> sites_;
   std::string pending_country_;
   std::string pending_version_;