[Popular Sites] Add Variations parameter to override URL path

components/ntp_tiles/webui/popular_sites_internals_message_handler.cc

 // Copyright 2016 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/webui/popular_sites_internals_message_handler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 41 matching lines @@
   DCHECK(args->empty());
 
   SendOverrides();
 
   popular_sites_ = web_ui_->MakePopularSites();
   SendSites();
 }
 
 void PopularSitesInternalsMessageHandler::HandleUpdate(
     const base::ListValue* args) {
-  DCHECK_EQ(3u, args->GetSize());
+  DCHECK_EQ(4u, args->GetSize());
 
   PrefService* prefs = web_ui_->GetPrefs();
 
   std::string url;
   args->GetString(0, &url);
   if (url.empty())
     prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideURL);
   else
     prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideURL,
                      url_formatter::FixupURL(url, std::string()).spec());
 
+  std::string directory;
+  args->GetString(1, &directory);
+  if (directory.empty())
+    prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideDirectory);
+  else
+    prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory,
+                     directory);
+
   std::string country;
-  args->GetString(1, &country);
+  args->GetString(2, &country);
   if (country.empty())
     prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideCountry);
   else
     prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideCountry, country);
 
   std::string version;
-  args->GetString(2, &version);
+  args->GetString(3, &version);
   if (version.empty())
     prefs->ClearPref(ntp_tiles::prefs::kPopularSitesOverrideVersion);
   else
     prefs->SetString(ntp_tiles::prefs::kPopularSitesOverrideVersion, version);
 
   popular_sites_ = web_ui_->MakePopularSites();
   popular_sites_->MaybeStartFetch(
       true,
       base::Bind(&PopularSitesInternalsMessageHandler::OnPopularSitesAvailable,
                  base::Unretained(this)));
 }
 
 void PopularSitesInternalsMessageHandler::HandleViewJson(
     const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
   const base::ListValue* json = popular_sites_->GetCachedJson();
   std::string json_string;
   if (json) {
     bool success = base::JSONWriter::Write(*json, &json_string);
     DCHECK(success);
   }
   SendJson(json_string);
 }
 
 void PopularSitesInternalsMessageHandler::SendOverrides() {
   PrefService* prefs = web_ui_->GetPrefs();
   std::string url =
       prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideURL);
+  std::string directory =
+      prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideDirectory);
   std::string country =
       prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideCountry);
   std::string version =
       prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideVersion);
   web_ui_->CallJavascriptFunction(
       "chrome.popular_sites_internals.receiveOverrides", base::Value(url),
-      base::Value(country), base::Value(version));
+      base::Value(directory), base::Value(country), base::Value(version));
 }
 
 void PopularSitesInternalsMessageHandler::SendDownloadResult(bool success) {
   base::Value result(success ? "Success" : "Fail");
   web_ui_->CallJavascriptFunction(
       "chrome.popular_sites_internals.receiveDownloadResult", result);
 }
 
 void PopularSitesInternalsMessageHandler::SendSites() {
   auto sites_list = base::MakeUnique<base::ListValue>();
@@ skipping 16 matching lines @@
                                   base::Value(json));
 }
 
 void PopularSitesInternalsMessageHandler::OnPopularSitesAvailable(
     bool success) {
   SendDownloadResult(success);
   SendSites();
 }
 
 }  // namespace ntp_tiles