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

chrome/browser/android/most_visited_sites.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/android/most_visited_sites.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 111 matching lines @@
       base::FieldTrialList::FindFullName(kPopularSitesFieldTrialName);
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kDisableNTPPopularSites))
     return false;
   if (cmd_line->HasSwitch(switches::kEnableNTPPopularSites))
     return true;
   return base::StartsWith(group_name, "Enabled",
                           base::CompareCase::INSENSITIVE_ASCII);
 }
 
+std::string GetPopularSitesCountry() {
+  return variations::GetVariationParamValue(kPopularSitesFieldTrialName,
+                                            "country");
+}
+
+std::string GetPopularSitesVersion() {
+  return variations::GetVariationParamValue(kPopularSitesFieldTrialName,
+                                            "version");
+}
+
+// TODO(treib): Get rid of this.
 std::string GetPopularSitesFilename() {
   return variations::GetVariationParamValue(kPopularSitesFieldTrialName,
                                             "filename");
 }
 
 // Determine whether we need any popular suggestions to fill up a grid of
 // |num_tiles| tiles.
 bool NeedPopularSites(const PrefService* prefs, size_t num_tiles) {
   const base::ListValue* source_list =
       prefs->GetList(prefs::kNTPSuggestionsIsPersonal);
@@ skipping 89 matching lines @@
                                                   jobject obj,
                                                   jobject j_observer,
                                                   jint num_sites) {
   observer_.Reset(env, j_observer);
   num_sites_ = num_sites;
 
   if (ShouldShowPopularSites() &&
       NeedPopularSites(profile_->GetPrefs(), num_sites_)) {
     popular_sites_.reset(new PopularSites(
         profile_,
+        GetPopularSitesCountry(),
+        GetPopularSitesVersion(),
         GetPopularSitesFilename(),
         base::Bind(&MostVisitedSites::OnPopularSitesAvailable,
                    base::Unretained(this))));
   } else {
     received_popular_sites_ = true;
   }
 
   QueryMostVisitedURLs();
 
   scoped_refptr<history::TopSites> top_sites =
@@ skipping 475 matching lines @@
   }
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }