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

chrome/browser/android/popular_sites.h

Index: chrome/browser/android/popular_sites.h
diff --git a/chrome/browser/android/popular_sites.h b/chrome/browser/android/popular_sites.h
index be5687978315c85dc2bfe8ae5bdf3a7b30a0b52a..635d3732220a391d2c780880a9f058bd398c6e52 100644
--- a/chrome/browser/android/popular_sites.h
+++ b/chrome/browser/android/popular_sites.h
@@ -46,9 +46,16 @@ class PopularSites {
   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();