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

components/ntp_snippets/remote/json_request_unittest.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 <set>
 #include <utility>
 
 #include "base/json/json_reader.h"
@@ skipping 96 matching lines @@
 TEST_F(JsonRequestTest, BuildRequestAuthenticated) {
   JsonRequest::Builder builder = CreateMinimalBuilder();
   RequestParams params;
   params.excluded_ids = {"1234567890"};
   params.count_to_fetch = 25;
   params.interactive_request = false;
   builder.SetParams(params)
       .SetUrl(GURL("http://valid-url.test"))
       .SetUrl(GURL("http://valid-url.test"))
       .SetAuthentication("0BFUSGAIA", "headerstuff")
-      .SetPersonalization(Personalization::kPersonal)
       .SetUserClassForTesting("ACTIVE_NTP_USER")
       .SetFetchAPI(FetchAPI::CHROME_READER_API)
       .Build();
 
   EXPECT_THAT(builder.PreviewRequestHeadersForTesting(),
               StrEq("Content-Type: application/json; charset=UTF-8\r\n"
                     "Authorization: headerstuff\r\n"
                     "\r\n"));
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"response_detail_level\": \"STANDARD\","
                          "  \"obfuscated_gaia_id\": \"0BFUSGAIA\","
                          "  \"advanced_options\": {"
                          "    \"local_scoring_params\": {"
-                         "      \"content_params\": {"
-                         "        \"only_return_personalized_results\": true"
-                         "      },"
                          "      \"content_restricts\": ["
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"TITLE\""
                          "        },"
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"SNIPPET\""
                          "        },"
                          "        {"
@@ skipping 21 matching lines @@
                          "}"));
 }
 
 TEST_F(JsonRequestTest, BuildRequestUnauthenticated) {
   JsonRequest::Builder builder;
   RequestParams params;
   params.interactive_request = true;
   params.count_to_fetch = 10;
   builder.SetParams(params)
       .SetUserClassForTesting("ACTIVE_NTP_USER")
-      .SetPersonalization(Personalization::kNonPersonal)
       .SetFetchAPI(FetchAPI::CHROME_READER_API);
 
   EXPECT_THAT(builder.PreviewRequestHeadersForTesting(),
               StrEq("Content-Type: application/json; charset=UTF-8\r\n"
                     "\r\n"));
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"response_detail_level\": \"STANDARD\","
                          "  \"advanced_options\": {"
                          "    \"local_scoring_params\": {"
-                         "      \"content_params\": {"
-                         "        \"only_return_personalized_results\": false"
-                         "      },"
                          "      \"content_restricts\": ["
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"TITLE\""
                          "        },"
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"SNIPPET\""
                          "        },"
                          "        {"
@@ skipping 20 matching lines @@
 
 TEST_F(JsonRequestTest, BuildRequestExcludedIds) {
   JsonRequest::Builder builder;
   RequestParams params;
   params.interactive_request = false;
   for (int i = 0; i < 200; ++i) {
     params.excluded_ids.insert(base::StringPrintf("%03d", i));
   }
   builder.SetParams(params)
       .SetUserClassForTesting("ACTIVE_NTP_USER")
-      .SetPersonalization(Personalization::kNonPersonal)
       .SetFetchAPI(FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"priority\": \"BACKGROUND_PREFETCH\","
                          "  \"excludedSuggestionIds\": ["
                          "    \"000\", \"001\", \"002\", \"003\", \"004\","
                          "    \"005\", \"006\", \"007\", \"008\", \"009\","
                          "    \"010\", \"011\", \"012\", \"013\", \"014\","
                          "    \"015\", \"016\", \"017\", \"018\", \"019\","
@@ skipping 17 matching lines @@
                          // be those lexically first.
                          "  ],"
                          "  \"userActivenessClass\": \"ACTIVE_NTP_USER\""
                          "}"));
 }
 
 TEST_F(JsonRequestTest, BuildRequestNoUserClass) {
   JsonRequest::Builder builder;
   RequestParams params;
   params.interactive_request = false;
-  builder.SetPersonalization(Personalization::kNonPersonal)
-      .SetParams(params)
+  builder.SetParams(params)
       .SetFetchAPI(FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"priority\": \"BACKGROUND_PREFETCH\","
                          "  \"excludedSuggestionIds\": []"
                          "}"));
 }
 
 TEST_F(JsonRequestTest, BuildRequestWithTwoLanguages) {
   JsonRequest::Builder builder;
   std::unique_ptr<translate::LanguageModel> language_model =
       MakeLanguageModel({"de", "en"});
   RequestParams params;
   params.interactive_request = true;
   params.language_code = "en";
   builder.SetParams(params)
       .SetLanguageModel(language_model.get())
-      .SetPersonalization(Personalization::kNonPersonal)
       .SetFetchAPI(FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"priority\": \"USER_ACTION\","
                          "  \"uiLanguage\": \"en\","
                          "  \"excludedSuggestionIds\": [],"
                          "  \"topLanguages\": ["
                          "    {"
                          "      \"language\" : \"en\","
                          "      \"frequency\" : 0.5"
                          "    },"
                          "    {"
                          "      \"language\" : \"de\","
                          "      \"frequency\" : 0.5"
                          "    }"
                          "  ]"
                          "}"));
 }
 
 TEST_F(JsonRequestTest, BuildRequestWithUILanguageOnly) {
   JsonRequest::Builder builder;
   std::unique_ptr<translate::LanguageModel> language_model =
       MakeLanguageModel({"en"});
   RequestParams params;
   params.interactive_request = true;
   params.language_code = "en";
   builder.SetParams(params)
       .SetLanguageModel(language_model.get())
-      .SetPersonalization(Personalization::kNonPersonal)
       .SetFetchAPI(FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"priority\": \"USER_ACTION\","
                          "  \"uiLanguage\": \"en\","
                          "  \"excludedSuggestionIds\": [],"
                          "  \"topLanguages\": [{"
                          "    \"language\" : \"en\","
                          "    \"frequency\" : 1.0"
                          "  }]"
                          "}"));
 }
 
 }  // namespace internal
 
 }  // namespace ntp_snippets