Index: components/ntp_snippets/ntp_snippets_fetcher_unittest.cc |
diff --git a/components/ntp_snippets/ntp_snippets_fetcher_unittest.cc b/components/ntp_snippets/ntp_snippets_fetcher_unittest.cc |
index c5ba65f6ac160c984fd8e6f314c1a42b5121fb37..8dc4e5d93edbaf1f17b122ad9b5544a4de8d49ab 100644 |
--- a/components/ntp_snippets/ntp_snippets_fetcher_unittest.cc |
+++ b/components/ntp_snippets/ntp_snippets_fetcher_unittest.cc |
@@ -367,7 +367,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldFetchSuccessfully) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/PointeeSizeIs(1))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_status(), Eq("OK")); |
EXPECT_THAT(snippets_fetcher().last_json(), Eq(kJsonStr)); |
@@ -402,7 +402,7 @@ TEST_F(NTPSnippetsContentSuggestionsFetcherTest, ShouldFetchSuccessfully) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/PointeeSizeIs(1))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_status(), Eq("OK")); |
EXPECT_THAT(snippets_fetcher().last_json(), Eq(kJsonStr)); |
@@ -421,7 +421,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldFetchSuccessfullyEmptyList) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/PointeeSizeIs(0))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_status(), Eq("OK")); |
EXPECT_THAT(snippets_fetcher().last_json(), Eq(kJsonStr)); |
@@ -438,7 +438,7 @@ TEST_F(NTPSnippetsFetcherHostRestrictedTest, ShouldReportEmptyHostsError) { |
snippets_fetcher().FetchSnippetsFromHosts(/*hosts=*/std::set<std::string>(), |
/*language_code=*/"en-US", |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_status(), |
Eq("Cannot fetch for empty hosts list.")); |
@@ -459,7 +459,7 @@ TEST_F(NTPSnippetsFetcherHostRestrictedTest, ShouldRestrictToHosts) { |
net::TestURLFetcherFactory test_url_fetcher_factory; |
snippets_fetcher().FetchSnippetsFromHosts( |
{"www.somehost1.com", "www.somehost2.com"}, test_lang(), /*count=*/17, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
net::TestURLFetcher* fetcher = test_url_fetcher_factory.GetFetcherByID(0); |
ASSERT_THAT(fetcher, NotNull()); |
std::unique_ptr<base::Value> value = |
@@ -491,7 +491,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldReportUrlStatusError) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/Not(HasValue()))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_status(), |
Eq("URLRequestStatus error -2")); |
@@ -512,7 +512,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldReportHttpError) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/Not(HasValue()))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_json(), IsEmpty()); |
EXPECT_THAT( |
@@ -532,7 +532,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldReportJsonError) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/Not(HasValue()))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_status(), |
StartsWith("Received invalid JSON (error ")); |
@@ -554,7 +554,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldReportJsonErrorForEmptyResponse) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/Not(HasValue()))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_json(), std::string()); |
EXPECT_THAT( |
@@ -573,7 +573,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldReportInvalidListError) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/Not(HasValue()))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT(snippets_fetcher().last_json(), Eq(kJsonStr)); |
EXPECT_THAT( |
@@ -593,7 +593,7 @@ TEST_F(NTPSnippetsFetcherTest, ShouldReportHttpErrorForMissingBakedResponse) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/Not(HasValue()))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
} |
@@ -604,12 +604,12 @@ TEST_F(NTPSnippetsFetcherTest, ShouldCancelOngoingFetch) { |
EXPECT_CALL(mock_callback(), Run(/*snippets=*/PointeeSizeIs(0))).Times(1); |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
// Second call to FetchSnippetsFromHosts() overrides/cancels the previous. |
// Callback is expected to be called once. |
snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(), |
/*count=*/1, |
- /*force_request=*/true); |
+ /*interactive_request=*/true); |
FastForwardUntilNoTasksRemain(); |
EXPECT_THAT( |
histogram_tester().GetAllSamples("NewTabPage.Snippets.FetchResult"), |