[Popular Sites] Add Variations parameter to override URL path

components/ntp_tiles/popular_sites_impl.cc

 // 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.
 
 #include "components/ntp_tiles/popular_sites_impl.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 #endif
 
 using net::URLFetcher;
 using variations::VariationsService;
 
 namespace ntp_tiles {
 
 namespace {
 
 const char kPopularSitesURLFormat[] =
-    "https://www.gstatic.com/chrome/ntp/suggested_sites_%s_%s.json";
+    "https://www.gstatic.com/%ssuggested_sites_%s_%s.json";
+const char kPopularSitesDefaultPath[] = "chrome/ntp/";

[sfiera, 2017/04/25 13:35:42]

This isn't the [whole] path, it's the directory.

(I would put the trailing slash in the format rather than here, but that's up to
you)

[mastiz, 2017/04/25 17:54:00]

Thanks, renamed path->directory.
I prefer keeping the trailing slash, which gives slightly more freedom.

 const char kPopularSitesDefaultCountryCode[] = "DEFAULT";
 const char kPopularSitesDefaultVersion[] = "5";
 const int kPopularSitesRedownloadIntervalHours = 24;
 
 const char kPopularSitesLastDownloadPref[] = "popular_sites_last_download";
 const char kPopularSitesURLPref[] = "popular_sites_url";
 const char kPopularSitesJsonPref[] = "suggested_sites_json";
 
 // TODO(crbug.com/683890): This refers to a local cache stored by older
 // versions of Chrome, no longer used. Remove after M61.
 const char kPopularSitesLocalFilenameToCleanup[] = "suggested_sites.json";
 
-GURL GetPopularSitesURL(const std::string& country,
+GURL GetPopularSitesURL(const std::string& path,
+                        const std::string& country,
                         const std::string& version) {
-  return GURL(base::StringPrintf(kPopularSitesURLFormat, country.c_str(),
-                                 version.c_str()));
+  return GURL(base::StringPrintf(kPopularSitesURLFormat, path.c_str(),
+                                 country.c_str(), version.c_str()));
 }
 
 // Extract the country from the default search engine if the default search
 // engine is Google.
 std::string GetDefaultSearchEngineCountryCode(
     const TemplateURLService* template_url_service) {
   DCHECK(template_url_service);
 
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(
@@ skipping 170 matching lines @@
 
 const PopularSites::SitesVector& PopularSitesImpl::sites() const {
   return sites_;
 }
 
 GURL PopularSitesImpl::GetLastURLFetched() const {
   return GURL(prefs_->GetString(kPopularSitesURLPref));
 }
 
 GURL PopularSitesImpl::GetURLToFetch() {
+  const std::string path = GetPathToFetch();
   const std::string country = GetCountryToFetch();
   const std::string version = GetVersionToFetch();
 
   const GURL override_url =
       GURL(prefs_->GetString(ntp_tiles::prefs::kPopularSitesOverrideURL));
   return override_url.is_valid() ? override_url
-                                 : GetPopularSitesURL(country, version);
+                                 : GetPopularSitesURL(path, country, version);
+}
+
+std::string PopularSitesImpl::GetPathToFetch() {
+  std::string path =
+      prefs_->GetString(ntp_tiles::prefs::kPopularSitesOverridePath);
+
+  if (path.empty())
+    path = kPopularSitesDefaultPath;
+
+  return path;
 }
 
 // Determine the country code to use. In order of precedence:
 // - The explicit "override country" pref set by the user.
 // - The country code from the field trial config (variation parameter).
 // - The Google country code if Google is the default search engine (and the
 //   "--enable-ntp-search-engine-country-detection" switch is present).
 // - The country provided by the VariationsService.
 // - A default fallback.
 std::string PopularSitesImpl::GetCountryToFetch() {
@@ skipping 39 matching lines @@
 
 const base::ListValue* PopularSitesImpl::GetCachedJson() {
   return prefs_->GetList(kPopularSitesJsonPref);
 }
 
 // static
 void PopularSitesImpl::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
   user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideURL,
                                  std::string());
+  user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverridePath,
+                                 std::string());
   user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideCountry,
                                  std::string());
   user_prefs->RegisterStringPref(ntp_tiles::prefs::kPopularSitesOverrideVersion,
                                  std::string());
 
   user_prefs->RegisterInt64Pref(kPopularSitesLastDownloadPref, 0);
   user_prefs->RegisterStringPref(kPopularSitesURLPref, std::string());
   user_prefs->RegisterListPref(kPopularSitesJsonPref, DefaultPopularSites());
 }
 
@@ skipping 68 matching lines @@
 
 void PopularSitesImpl::OnJsonParseFailed(const std::string& error_message) {
   DLOG(WARNING) << "JSON parsing failed: " << error_message;
   OnDownloadFailed();
 }
 
 void PopularSitesImpl::OnDownloadFailed() {
   if (!is_fallback_) {
     DLOG(WARNING) << "Download country site list failed";
     is_fallback_ = true;
-    pending_url_ = GetPopularSitesURL(kPopularSitesDefaultCountryCode,
+    pending_url_ = GetPopularSitesURL(kPopularSitesDefaultPath,
+                                      kPopularSitesDefaultCountryCode,
                                       kPopularSitesDefaultVersion);
     FetchPopularSites();
   } else {
     DLOG(WARNING) << "Download fallback site list failed";
     callback_.Run(false);
   }
 }
 
 }  // namespace ntp_tiles