Move classes to //components/ntp_tiles.

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 254b4a534d9de290575905ec85e649a0fa8f1eec..c592d9ae5a1421ee0b75906207fd5909b4f8653a 100644
--- a/chrome/browser/android/ntp/popular_sites.h
+++ b/chrome/browser/android/ntp/popular_sites.h
@@ -5,32 +5,9 @@
 #ifndef CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_

[Marc Treib, 2016/05/17 15:50:25]

Rename this to chrome_popular_sites.h/cc now?

[sfiera, 2016/05/18 08:43:42]

Next CL OK? webui references this file, and I wanted to avoid touching another
directory in this CL.

[Marc Treib, 2016/05/18 08:55:41]

Yup, that's okay.

 #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 "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;
+#include "components/ntp_tiles/popular_sites.h"
 
 // TODO(sfiera): move to chrome_popular_sites.h
 class ChromePopularSites {
@@ -41,120 +18,4 @@ class ChromePopularSites {
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChromePopularSites);
 };
 
-// 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 : 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() 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;
-
-  void OnReadFileDone(const GURL& url,
-                      std::unique_ptr<std::string> data,
-                      bool success);
-
-  // Fetch the popular sites at the given URL, overwriting any file that already
-  // exists.
-  void FetchPopularSites(const GURL& url);
-
-  // 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<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_;
-
-  scoped_refptr<base::TaskRunner> runner_;
-
-  base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(PopularSites);
-};
-
 #endif  // CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_