[NTP Popular Sites] Store country/version in prefs

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 <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/net/file_downloader.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-class FileDownloader;
 class Profile;
 
 // 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:
   struct Site {
     Site(const base::string16& title,
          const GURL& url,
@@ skipping 26 matching lines @@
   // This fetches the popular sites from a given url and is only used for
   // debugging through the popular-sites-internals page.
   PopularSites(Profile* profile,
                const GURL& url,
                const FinishedCallback& callback);
 
   ~PopularSites();
 
   const std::vector<Site>& sites() const { return sites_; }
 
-  const base::FilePath& local_path() const { return popular_sites_local_path_; }
+  // The country/version of the file that was loaded. These only have
+  // well-defined values after FinishedCallback has been called!

[Bernhard Bauer, 2016/04/01 15:49:47]

That also applies to sites(), right?

[Marc Treib, 2016/04/01 16:33:28]

sites() will just be empty. These might actually have inaccurate values.

+  const std::string& country() const { return country_; }
+  const std::string& version() const { return version_; }
+
+  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(Profile* profile,
-               const GURL& url,
+               const std::string& country,
+               const std::string& version,
+               const GURL& override_url,
                bool force_download,
                const FinishedCallback& callback);
 
   // 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);
 
   // If the download was not successful and it was not a fallback, attempt to
   // download the fallback suggestions.
-  void OnDownloadDone(bool success, bool is_fallback);
+  void OnDownloadDone(bool is_fallback, FileDownloader::Result result);
 
   void ParseSiteList(const base::FilePath& path);
   void OnJsonParsed(scoped_ptr<std::vector<Site>> sites);
 
   FinishedCallback callback_;
   scoped_ptr<FileDownloader> downloader_;
   std::vector<Site> sites_;
+  std::string country_;
+  std::string version_;
 
-  base::FilePath popular_sites_local_path_;
+  base::FilePath local_path_;
 
   Profile* profile_;
 
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_