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

chrome/browser/android/popular_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/popular_sites.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 10 matching lines @@
 #include "components/search_engines/search_engine_type.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kPopularSitesURLFormat[] = "https://www.gstatic.com/chrome/ntp/%s";
-const char kPopularSitesServerFilenameFormat[] = "suggested_sites_%s_2.json";
+const char kPopularSitesServerFilenameFormat[] = "suggested_sites_%s_%s.json";
 const char kPopularSitesDefaultCountryCode[] = "DEFAULT";
+const char kPopularSitesDefaultVersion[] = "2";
 const char kPopularSitesLocalFilename[] = "suggested_sites.json";
 
 
 // Find out the country code of the user by using the Google country code if
 // Google is the default search engine set. Fallback to a default if we can't
 // make an educated guess.
 std::string GetCountryCode(Profile* profile) {
   DCHECK(profile);
 
   const TemplateURLService* template_url_service =
      TemplateURLServiceFactory::GetForProfile(profile);
   DCHECK(template_url_service);
 
   const TemplateURL* default_provider =
       template_url_service->GetDefaultSearchProvider();
   // It's possible to not have a default provider in the case that the default
   // search engine is defined by policy.
   if (!default_provider)
       return kPopularSitesDefaultCountryCode;
 
   bool is_google_search_engine = TemplateURLPrepopulateData::GetEngineType(
       *default_provider, template_url_service->search_terms_data()) ==
           SearchEngineType::SEARCH_ENGINE_GOOGLE;
 
   if (!is_google_search_engine)
-      return kPopularSitesDefaultCountryCode;
+    return kPopularSitesDefaultCountryCode;
 
   GURL search_url = default_provider->GenerateSearchURL(
       template_url_service->search_terms_data());
 
   std::string country_code =
       base::ToUpperASCII(google_util::GetGoogleCountryCode(search_url));
 
   return country_code;
 }
 
-std::string GetPopularSitesServerFilename(Profile* profile,
-                                          const std::string& filename) {
-  if (!filename.empty())
-    return filename;
+std::string GetPopularSitesServerFilename(
+    Profile* profile,
+    const std::string& override_country,
+    const std::string& override_version,
+    const std::string& override_filename) {
+  if (!override_filename.empty())
+    return override_filename;
 
+  std::string country = !override_country.empty() ? override_country
+                                                  : GetCountryCode(profile);
+  std::string version = !override_version.empty() ? override_version
+                                                  : kPopularSitesDefaultVersion;
   return base::StringPrintf(kPopularSitesServerFilenameFormat,
-                            GetCountryCode(profile).c_str());
+                            country.c_str(), version.c_str());
 }
 
-GURL GetPopularSitesURL(Profile* profile, const std::string& filename) {
+GURL GetPopularSitesURL(Profile* profile,
+                        const std::string& override_country,
+                        const std::string& override_version,
+                        const std::string& override_filename) {
   return GURL(base::StringPrintf(kPopularSitesURLFormat,
-      GetPopularSitesServerFilename(profile, filename).c_str()));
+      GetPopularSitesServerFilename(profile,
+                                    override_country,
+                                    override_version,
+                                    override_filename).c_str()));
 }
 
 base::FilePath GetPopularSitesPath() {
   base::FilePath dir;
   PathService::Get(chrome::DIR_USER_DATA, &dir);
   return dir.AppendASCII(kPopularSitesLocalFilename);
 }
 
 scoped_ptr<std::vector<PopularSites::Site>> ReadAndParseJsonFile(
     const base::FilePath& path) {
@@ skipping 40 matching lines @@
                          const GURL& favicon_url,
                          const GURL& thumbnail_url)
     : title(title),
       url(url),
       favicon_url(favicon_url),
       thumbnail_url(thumbnail_url) {}
 
 PopularSites::Site::~Site() {}
 
 PopularSites::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)
     : callback_(callback), weak_ptr_factory_(this) {
   base::FilePath path = GetPopularSitesPath();
   // Re-download the file once on every Chrome startup, but use the cached
   // local file afterwards.
   static bool overwrite = true;
   downloader_.reset(new FileDownloader(
-      GetPopularSitesURL(profile, filename), path, overwrite,
-      profile->GetRequestContext(),
+      GetPopularSitesURL(
+          profile, override_country, override_version, override_filename),
+      path, overwrite, profile->GetRequestContext(),
       base::Bind(&PopularSites::OnDownloadDone, base::Unretained(this), path)));
   overwrite = false;
 }
 
 PopularSites::~PopularSites() {}
 
 void PopularSites::OnDownloadDone(const base::FilePath& path, bool success) {
   if (success) {
     base::PostTaskAndReplyWithResult(
         BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
@@ skipping 10 matching lines @@
   downloader_.reset();
 }
 
 void PopularSites::OnJsonParsed(scoped_ptr<std::vector<Site>> sites) {
   if (sites)
     sites_.swap(*sites);
   else
     sites_.clear();
   callback_.Run(!!sites);
 }