Popular sites on the NTP: Add Finch params for country and version

chrome/browser/android/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_POPULAR_SITES_H_
 #define CHROME_BROWSER_ANDROID_POPULAR_SITES_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 28 matching lines @@
 
     base::string16 title;
     GURL url;
     GURL favicon_url;
     GURL thumbnail_url;
   };
 
   using FinishedCallback = base::Callback<void(bool /* success */)>;
 
   // Usually, the name of the file that's downloaded is based on the user's
-  // locale. |filename|, if non-empty, will override that default name.
+  // locale. |override_country| (if non-empty) is used to override the
+  // auto-detected country. |override_version|, if non-empty, will
+  // override the baked-in default version.
+  // |override_filename|, if non-empty, will override the full filename
+  // (so |override_country| and |override_version| are ignored in this case).
+  // TODO(treib): Get rid of |override_filename|.
   PopularSites(Profile* profile,
-               const std::string& filename,
+               const std::string& override_country,
+               const std::string& override_version,
+               const std::string& override_filename,
                const FinishedCallback& callback);
   ~PopularSites();
 
   const std::vector<Site>& sites() const { return sites_; }
 
  private:
   void OnDownloadDone(const base::FilePath& path, bool success);
   void OnJsonParsed(scoped_ptr<std::vector<Site>> sites);
 
   FinishedCallback callback_;
   scoped_ptr<FileDownloader> downloader_;
   std::vector<Site> sites_;
 
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_POPULAR_SITES_H_