[Remote suggestions] Clean up variation params in the fetcher.

components/ntp_snippets/remote/json_request.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_snippets/remote/json_request.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 235 matching lines @@
   std::string json_string;
   url_fetcher_->GetResponseAsString(&json_string);
   LOG(WARNING) << "Received invalid JSON (" << error << "): " << json_string;
   std::move(request_completed_callback_)
       .Run(/*result=*/nullptr, FetchResult::JSON_PARSE_ERROR,
            /*error_details=*/base::StringPrintf(" (error %s)", error.c_str()));
 }
 
 JsonRequest::Builder::Builder()
     : fetch_api_(CHROME_READER_API),
-      personalization_(Personalization::kBoth),
       language_model_(nullptr) {}
 JsonRequest::Builder::Builder(JsonRequest::Builder&&) = default;
 JsonRequest::Builder::~Builder() = default;
 
 std::unique_ptr<JsonRequest> JsonRequest::Builder::Build() const {
   DCHECK(!url_.is_empty());
   DCHECK(url_request_context_getter_);
   DCHECK(tick_clock_);
   auto request = base::MakeUnique<JsonRequest>(
       params_.exclusive_category, tick_clock_, parse_json_callback_);
@@ skipping 33 matching lines @@
   params_ = params;
   return *this;
 }
 
 JsonRequest::Builder& JsonRequest::Builder::SetParseJsonCallback(
     ParseJSONCallback callback) {
   parse_json_callback_ = callback;
   return *this;
 }
 
-JsonRequest::Builder& JsonRequest::Builder::SetPersonalization(
-    Personalization personalization) {
-  personalization_ = personalization;
-  return *this;
-}
-
 JsonRequest::Builder& JsonRequest::Builder::SetTickClock(
     base::TickClock* tick_clock) {
   tick_clock_ = tick_clock;
   return *this;
 }
 
 JsonRequest::Builder& JsonRequest::Builder::SetUrl(const GURL& url) {
   url_ = url;
   return *this;
 }
@@ skipping 27 matching lines @@
                                      false,  // uma_enabled
                                      is_signed_in, &headers);
   return headers.ToString();
 }
 
 std::string JsonRequest::Builder::BuildBody() const {
   auto request = base::MakeUnique<base::DictionaryValue>();
   std::string user_locale = PosixLocaleFromBCP47Language(params_.language_code);
   switch (fetch_api_) {
     case CHROME_READER_API: {
-      auto content_params = base::MakeUnique<base::DictionaryValue>();
-      content_params->SetBoolean("only_return_personalized_results",
-                                 ReturnOnlyPersonalizedResults());
-
       auto content_restricts = base::MakeUnique<base::ListValue>();
       for (const auto* metadata : {"TITLE", "SNIPPET", "THUMBNAIL"}) {
         auto entry = base::MakeUnique<base::DictionaryValue>();
         entry->SetString("type", "METADATA");
         entry->SetString("value", metadata);
         content_restricts->Append(std::move(entry));
       }
 
       auto local_scoring_params = base::MakeUnique<base::DictionaryValue>();
-      local_scoring_params->Set("content_params", std::move(content_params));
       local_scoring_params->Set("content_restricts",
                                 std::move(content_restricts));
 
       auto global_scoring_params = base::MakeUnique<base::DictionaryValue>();
       global_scoring_params->SetInteger("num_to_return",
                                         params_.count_to_fetch);
       global_scoring_params->SetInteger("sort_type", 1);
 
       auto advanced = base::MakeUnique<base::DictionaryValue>();
       advanced->Set("local_scoring_params", std::move(local_scoring_params));
@@ skipping 42 matching lines @@
 
       auto language_list = base::MakeUnique<base::ListValue>();
       if (ui_language.frequency > 0) {
         AppendLanguageInfoToList(language_list.get(), ui_language);
       }
       if (other_top_language.frequency > 0) {
         AppendLanguageInfoToList(language_list.get(), other_top_language);
       }
       request->Set("topLanguages", std::move(language_list));
 
-      // TODO(sfiera): Support only_return_personalized_results.
       // TODO(sfiera): Support count_to_fetch.
       break;
     }
   }
 
   std::string request_json;
   bool success = base::JSONWriter::WriteWithOptions(
       *request, base::JSONWriter::OPTIONS_PRETTY_PRINT, &request_json);
   DCHECK(success);
   return request_json;
@@ skipping 53 matching lines @@
           "NewTabPage.Languages.UILanguageRatioInTwoTopLanguages",
           ratio_ui_in_both_languages * 100);
       break;
     }
   }
 }
 
 }  // namespace internal
 
 }  // namespace ntp_snippets