Add request type to FetchSuggestionsRequest.

components/ntp_snippets/ntp_snippets_fetcher_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/ntp_snippets_fetcher.h"
 
 #include <map>
 #include <utility>
 
 #include "base/json/json_reader.h"
@@ skipping 129 matching lines @@
 
 GURL GetFetcherUrl(const char* url_format) {
   return GURL(base::StringPrintf(url_format, google_apis::GetAPIKey().c_str()));
 }
 
 }  // namespace
 
 class NTPSnippetsFetcherTest : public testing::Test {
  public:
   NTPSnippetsFetcherTest()
-      : NTPSnippetsFetcherTest(
-            GetFetcherUrl(kTestChromeReaderUrlFormat),
-            std::map<std::string, std::string>()) {}
+      : NTPSnippetsFetcherTest(GetFetcherUrl(kTestChromeReaderUrlFormat),
+                               std::map<std::string, std::string>()) {}
 
   NTPSnippetsFetcherTest(const GURL& gurl,
                          const std::map<std::string, std::string>& params)
       : params_manager_(ntp_snippets::kStudyName, params),
         mock_task_runner_(new base::TestMockTimeTaskRunner()),
         mock_task_runner_handle_(mock_task_runner_),
         signin_client_(new TestSigninClient(nullptr)),
         account_tracker_(new AccountTrackerService()),
         fake_signin_manager_(new FakeSigninManagerBase(signin_client_.get(),
                                                        account_tracker_.get())),
@@ skipping 74 matching lines @@
  public:
   NTPSnippetsContentSuggestionsFetcherTest()
       : NTPSnippetsFetcherTest(
             GetFetcherUrl(kTestChromeContentSuggestionsUrlFormat),
             {{"content_suggestions_backend", kContentSuggestionsServer}}) {}
 };
 
 class NTPSnippetsFetcherHostRestrictedTest : public NTPSnippetsFetcherTest {
  public:
   NTPSnippetsFetcherHostRestrictedTest()
-      : NTPSnippetsFetcherTest(
-            GetFetcherUrl(kTestChromeReaderUrlFormat),
-            {{"fetching_host_restrict", "on"}}) {}
+      : NTPSnippetsFetcherTest(GetFetcherUrl(kTestChromeReaderUrlFormat),
+                               {{"fetching_host_restrict", "on"}}) {}
 };
 
 TEST_F(NTPSnippetsFetcherTest, BuildRequestAuthenticated) {
   NTPSnippetsFetcher::RequestParams params;
   params.obfuscated_gaia_id = "0BFUSGAIA";
   params.only_return_personalized_results = true;
   params.user_locale = "en";
   params.host_restricts = {"chromium.org"};
   params.count_to_fetch = 25;
+  params.interactive_request = false;
 
   params.fetch_api = NTPSnippetsFetcher::CHROME_READER_API;
   EXPECT_THAT(params.BuildRequest(),
               EqualsJSON("{"
                          "  \"response_detail_level\": \"STANDARD\","
                          "  \"obfuscated_gaia_id\": \"0BFUSGAIA\","
                          "  \"user_locale\": \"en\","
                          "  \"advanced_options\": {"
                          "    \"local_scoring_params\": {"
                          "      \"content_params\": {"
@@ skipping 24 matching lines @@
                          "      \"num_to_return\": 25,"
                          "      \"sort_type\": 1"
                          "    }"
                          "  }"
                          "}"));
 
   params.fetch_api = NTPSnippetsFetcher::CHROME_CONTENT_SUGGESTIONS_API;
   EXPECT_THAT(params.BuildRequest(),
               EqualsJSON("{"
                          "  \"uiLanguage\": \"en\","
+                         "  \"type\": \"BACKGROUND\","
                          "  \"regularlyVisitedHostNames\": ["
                          "    \"chromium.org\""
                          "  ]"
                          "}"));
 }
 
 TEST_F(NTPSnippetsFetcherTest, BuildRequestUnauthenticated) {
   NTPSnippetsFetcher::RequestParams params;
   params.only_return_personalized_results = false;
   params.host_restricts = {};
   params.count_to_fetch = 10;
+  params.interactive_request = true;
 
   params.fetch_api = NTPSnippetsFetcher::CHROME_READER_API;
   EXPECT_THAT(params.BuildRequest(),
               EqualsJSON("{"
                          "  \"response_detail_level\": \"STANDARD\","
                          "  \"advanced_options\": {"
                          "    \"local_scoring_params\": {"
                          "      \"content_params\": {"
                          "        \"only_return_personalized_results\": false"
                          "      },"
@@ skipping 16 matching lines @@
                          "    \"global_scoring_params\": {"
                          "      \"num_to_return\": 10,"
                          "      \"sort_type\": 1"
                          "    }"
                          "  }"
                          "}"));
 
   params.fetch_api = NTPSnippetsFetcher::CHROME_CONTENT_SUGGESTIONS_API;
   EXPECT_THAT(params.BuildRequest(),
               EqualsJSON("{"
-                         "  \"regularlyVisitedHostNames\": []"
+                         "  \"regularlyVisitedHostNames\": [],"
+                         "  \"type\": \"INTERACTIVE\""
                          "}"));
 }
 
 TEST_F(NTPSnippetsFetcherTest, ShouldNotFetchOnCreation) {
   // The lack of registered baked in responses would cause any fetch to fail.
   FastForwardUntilNoTasksRemain();
   EXPECT_THAT(histogram_tester().GetAllSamples(
                   "NewTabPage.Snippets.FetchHttpResponseOrErrorCode"),
               IsEmpty());
   EXPECT_THAT(histogram_tester().GetAllSamples("NewTabPage.Snippets.FetchTime"),
@@ skipping 352 matching lines @@
   if (snippets) {
     // Matchers above aren't any more precise than this, so this is sufficient
     // for test-failure diagnostics.
     return os << "list with " << snippets->size() << " elements";
   } else {
     return os << "null";
   }
 }
 
 }  // namespace ntp_snippets