Remove host restrictions from snippets

components/ntp_snippets/remote/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/remote/ntp_snippets_fetcher.h"
 
 #include <deque>
 #include <map>
 #include <utility>
 
@@ skipping 424 matching lines @@
       : NTPSnippetsFetcherTestBase(GURL(kTestChromeContentSuggestionsUrl)) {
     SetDefaultVariationParam("content_suggestions_backend",
                              kContentSuggestionsServer);
     ResetSnippetsFetcher();
   }
 };
 
 TEST_F(ChromeReaderSnippetsFetcherTest, BuildRequestAuthenticated) {
   NTPSnippetsFetcher::RequestBuilder builder;
   NTPSnippetsFetcher::Params params;
-  params.hosts = {"chromium.org"};
   params.excluded_ids = {"1234567890"};
   params.count_to_fetch = 25;
   params.interactive_request = false;
   builder.SetParams(params)
       .SetAuthentication("0BFUSGAIA", "headerstuff")
       .SetPersonalization(NTPSnippetsFetcher::Personalization::kPersonal)
       .SetUserClassForTesting("ACTIVE_NTP_USER")
       .SetFetchAPI(NTPSnippetsFetcher::CHROME_READER_API);
 
   EXPECT_THAT(builder.PreviewRequestHeadersForTesting(),
@@ skipping 15 matching lines @@
                          "          \"value\": \"TITLE\""
                          "        },"
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"SNIPPET\""
                          "        },"
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"THUMBNAIL\""
                          "        }"
-                         "      ],"
-                         "      \"content_selectors\": ["
-                         "        {"
-                         "          \"type\": \"HOST_RESTRICT\","
-                         "          \"value\": \"chromium.org\""
-                         "        }"
                          "      ]"
                          "    },"
                          "    \"global_scoring_params\": {"
                          "      \"num_to_return\": 25,"
                          "      \"sort_type\": 1"
                          "    }"
                          "  }"
                          "}"));
 
   builder.SetFetchAPI(
       NTPSnippetsFetcher::FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
                          "  \"priority\": \"BACKGROUND_PREFETCH\","
-                         "  \"regularlyVisitedHostNames\": ["
-                         "    \"chromium.org\""
-                         "  ],"
                          "  \"excludedSuggestionIds\": ["
                          "    \"1234567890\""
                          "  ],"
                          "  \"userActivenessClass\": \"ACTIVE_NTP_USER\""
                          "}"));
 }
 
 TEST_F(ChromeReaderSnippetsFetcherTest, BuildRequestUnauthenticated) {
   NTPSnippetsFetcher::RequestBuilder builder;
   NTPSnippetsFetcher::Params params = test_params();
@@ skipping 20 matching lines @@
                          "          \"value\": \"TITLE\""
                          "        },"
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"SNIPPET\""
                          "        },"
                          "        {"
                          "          \"type\": \"METADATA\","
                          "          \"value\": \"THUMBNAIL\""
                          "        }"
-                         "      ],"
-                         "      \"content_selectors\": []"
+                         "      ]"
                          "    },"
                          "    \"global_scoring_params\": {"
                          "      \"num_to_return\": 10,"
                          "      \"sort_type\": 1"
                          "    }"
                          "  }"
                          "}"));
 
   builder.SetFetchAPI(
       NTPSnippetsFetcher::FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
-                         "  \"regularlyVisitedHostNames\": [],"
                          "  \"priority\": \"USER_ACTION\","
                          "  \"excludedSuggestionIds\": [],"
                          "  \"userActivenessClass\": \"ACTIVE_NTP_USER\""
                          "}"));
 }
 
 TEST_F(ChromeReaderSnippetsFetcherTest, BuildRequestExcludedIds) {
   NTPSnippetsFetcher::RequestBuilder builder;
   NTPSnippetsFetcher::Params params = test_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(NTPSnippetsFetcher::Personalization::kNonPersonal)
       .SetFetchAPI(
           NTPSnippetsFetcher::FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
-                         "  \"regularlyVisitedHostNames\": [],"
                          "  \"priority\": \"BACKGROUND_PREFETCH\","
                          "  \"excludedSuggestionIds\": ["
                          "    \"000\", \"001\", \"002\", \"003\", \"004\","
                          "    \"005\", \"006\", \"007\", \"008\", \"009\","
                          "    \"010\", \"011\", \"012\", \"013\", \"014\","
                          "    \"015\", \"016\", \"017\", \"018\", \"019\","
                          "    \"020\", \"021\", \"022\", \"023\", \"024\","
                          "    \"025\", \"026\", \"027\", \"028\", \"029\","
                          "    \"030\", \"031\", \"032\", \"033\", \"034\","
                          "    \"035\", \"036\", \"037\", \"038\", \"039\","
@@ skipping 20 matching lines @@
   NTPSnippetsFetcher::RequestBuilder builder;
   NTPSnippetsFetcher::Params params = test_params();
   params.interactive_request = false;
   builder.SetPersonalization(NTPSnippetsFetcher::Personalization::kNonPersonal)
       .SetParams(params)
       .SetFetchAPI(
           NTPSnippetsFetcher::FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
-                         "  \"regularlyVisitedHostNames\": [],"
                          "  \"priority\": \"BACKGROUND_PREFETCH\","
                          "  \"excludedSuggestionIds\": []"
                          "}"));
 }
 
 TEST_F(ChromeReaderSnippetsFetcherTest, BuildRequestWithTwoLanguages) {
   NTPSnippetsFetcher::RequestBuilder builder;
   std::unique_ptr<translate::LanguageModel> language_model =
       MakeLanguageModel({"de", "en"});
   NTPSnippetsFetcher::Params params = test_params();
   params.language_code = "en";
   builder.SetParams(params)
       .SetLanguageModel(language_model.get())
       .SetPersonalization(NTPSnippetsFetcher::Personalization::kNonPersonal)
       .SetFetchAPI(
           NTPSnippetsFetcher::FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
-                         "  \"regularlyVisitedHostNames\": [],"
                          "  \"priority\": \"USER_ACTION\","
                          "  \"uiLanguage\": \"en\","
                          "  \"excludedSuggestionIds\": [],"
                          "  \"topLanguages\": ["
                          "    {"
                          "      \"language\" : \"en\","
                          "      \"frequency\" : 0.5"
                          "    },"
                          "    {"
                          "      \"language\" : \"de\","
@@ skipping 10 matching lines @@
   NTPSnippetsFetcher::Params params = test_params();
   params.language_code = "en";
   builder.SetParams(params)
       .SetLanguageModel(language_model.get())
       .SetPersonalization(NTPSnippetsFetcher::Personalization::kNonPersonal)
       .SetFetchAPI(
           NTPSnippetsFetcher::FetchAPI::CHROME_CONTENT_SUGGESTIONS_API);
 
   EXPECT_THAT(builder.PreviewRequestBodyForTesting(),
               EqualsJSON("{"
-                         "  \"regularlyVisitedHostNames\": [],"
                          "  \"priority\": \"USER_ACTION\","
                          "  \"uiLanguage\": \"en\","
                          "  \"excludedSuggestionIds\": [],"
                          "  \"topLanguages\": [{"
                          "    \"language\" : \"en\","
                          "    \"frequency\" : 1.0"
                          "  }]"
                          "}"));
 }
 
@@ skipping 314 matching lines @@
   EXPECT_THAT(snippets_fetcher().last_status(), Eq("OK"));
   EXPECT_THAT(snippets_fetcher().last_json(), Eq(kJsonStr));
   EXPECT_THAT(
       histogram_tester().GetAllSamples("NewTabPage.Snippets.FetchResult"),
       ElementsAre(base::Bucket(/*min=*/0, /*count=*/1)));
   EXPECT_THAT(histogram_tester().GetAllSamples(
                   "NewTabPage.Snippets.FetchHttpResponseOrErrorCode"),
               ElementsAre(base::Bucket(/*min=*/200, /*count=*/1)));
 }
 
-TEST_F(ChromeReaderSnippetsFetcherTest, ShouldRestrictToHosts) {
-  DelegateCallingTestURLFetcherFactory fetcher_factory;
-  NTPSnippetsFetcher::Params params = test_params();
-  params.hosts = {"www.somehost1.com", "www.somehost2.com"};
-  params.count_to_fetch = 17;
-
-  snippets_fetcher().FetchSnippets(
-      params, ToSnippetsAvailableCallback(&mock_callback()));
-
-  net::TestURLFetcher* fetcher = fetcher_factory.GetLastCreatedFetcher();
-  ASSERT_THAT(fetcher, NotNull());
-  std::unique_ptr<base::Value> value =
-      base::JSONReader::Read(fetcher->upload_data());
-  ASSERT_TRUE(value) << " failed to parse JSON: "
-                     << PrintToString(fetcher->upload_data());
-  const base::DictionaryValue* dict = nullptr;
-  ASSERT_TRUE(value->GetAsDictionary(&dict));
-  const base::DictionaryValue* local_scoring_params = nullptr;
-  ASSERT_TRUE(dict->GetDictionary("advanced_options.local_scoring_params",
-                                  &local_scoring_params));
-  const base::ListValue* content_selectors = nullptr;
-  ASSERT_TRUE(
-      local_scoring_params->GetList("content_selectors", &content_selectors));
-  ASSERT_THAT(content_selectors->GetSize(), Eq(static_cast<size_t>(2)));
-  const base::DictionaryValue* content_selector = nullptr;
-  ASSERT_TRUE(content_selectors->GetDictionary(0, &content_selector));
-  std::string content_selector_value;
-  EXPECT_TRUE(content_selector->GetString("value", &content_selector_value));
-  EXPECT_THAT(content_selector_value, Eq("www.somehost1.com"));
-  ASSERT_TRUE(content_selectors->GetDictionary(1, &content_selector));
-  EXPECT_TRUE(content_selector->GetString("value", &content_selector_value));
-  EXPECT_THAT(content_selector_value, Eq("www.somehost2.com"));
-}
-
 TEST_F(ChromeReaderSnippetsFetcherTest, RetryOnInteractiveRequests) {
   DelegateCallingTestURLFetcherFactory fetcher_factory;
   NTPSnippetsFetcher::Params params = test_params();
   params.interactive_request = true;
 
   snippets_fetcher().FetchSnippets(
       params, ToSnippetsAvailableCallback(&mock_callback()));
 
   net::TestURLFetcher* fetcher = fetcher_factory.GetLastCreatedFetcher();
   ASSERT_THAT(fetcher, NotNull());
@@ skipping 193 matching lines @@
     const NTPSnippetsFetcher::OptionalFetchedCategories& fetched_categories) {
   if (fetched_categories) {
     // Matchers above aren't any more precise than this, so this is sufficient
     // for test-failure diagnostics.
     return os << "list with " << fetched_categories->size() << " elements";
   }
   return os << "null";
 }
 
 }  // namespace ntp_snippets