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

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>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #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 {
 class URLRequestContextGetter;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace variations {
 class VariationsService;
 }
 
 class PrefService;
 class TemplateURLService;
 
+namespace ntp_tiles {
+
+base::FilePath GetPopularSitesDirectory();

[Bernhard Bauer, 2016/05/12 12:24:24]

Wait, where will this eventually end up? In ntp_tiles the implementation can't
depend on //chrome either. (And if both this and PopularSites will live in the
same layer, there is no reason to separate them.)

[sfiera, 2016/05/12 14:03:05]

This function will stay here but the PopularSites class will move.

[Bernhard Bauer, 2016/05/12 14:28:27]

But ntp_tiles is the name of the component, no? So why is this in a namespace
but PopularSites isn't?

[Marc Treib, 2016/05/12 14:31:48]

Because PopularSites isn't actually in the component yet, but I insisted on a
namespace for the global function ;)

[sfiera, 2016/05/12 14:32:23]

Short answer: Marc asked for it ;)

I had figured that I would move the moving code into the namespace at the time
that I move it into the component, but this code will be untouched by that
change.

[Bernhard Bauer, 2016/05/12 14:37:09]

OK, but if this will stay outside of the component, ntp_tiles is not the right
namespace for it. The common thing would be to use a namespace named after the
filename (i.e. popular_sites), or to move it into a purely static class. (The
most common thing for that class in turn would be to be named "Chrome" + the
name of the thing it embeds, i.e. ChromePopularSites.

+
+}  // namespace ntp_tiles
+
 // 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,
          const GURL& url,
          const GURL& favicon_url,
          const GURL& large_icon_url,
          const GURL& thumbnail_url);
     Site(const Site& other);
     ~Site();
 
     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.
+  //
   // 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,
                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,
                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_; }
 
   // 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,
                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,
                bool force_download,
                const FinishedCallback& callback);
 
   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);
+  void OnReadFileDone(const GURL& url,
+                      std::unique_ptr<std::string> data,
+                      bool success);
 
-  // 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);
+  // Fetch the popular sites at the given URL, overwriting any file that already
+  // exists.
+  void FetchPopularSites(const GURL& url);
 
-  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);
+  void ParseSiteList(const std::string& json);
   void OnJsonParsed(std::unique_ptr<std::vector<Site>> sites);
+  void OnDownloadFailed();
 
   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_;
 
   base::FilePath local_path_;
 
   PrefService* prefs_;
   const TemplateURLService* template_url_service_;
   net::URLRequestContextGetter* download_context_;
 
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_