Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/ntp_snippets_service_unittest.cc

 // Copyright 2015 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_service.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 473 matching lines @@
   LoadFromJSONString(GetTestJson({GetSnippet()}));
   ASSERT_THAT(service()->snippets(), SizeIs(1));
 
   LoadFromJSONString(GetTestJson({GetIncompleteSnippet()}));
   EXPECT_EQ("Invalid / empty list.",
             service()->snippets_fetcher()->last_status());
   // This should not have changed the existing snippets.
   EXPECT_THAT(service()->snippets(), SizeIs(1));
 }
 
-TEST_F(NTPSnippetsServiceTest, Discard) {
+TEST_F(NTPSnippetsServiceTest, Dismiss) {
   std::vector<std::string> source_urls, publishers, amp_urls;
   source_urls.push_back(std::string("http://site.com"));
   publishers.push_back(std::string("Source 1"));
   amp_urls.push_back(std::string());
   std::string json_str(
       GetTestJson({GetSnippetWithSources(source_urls, publishers, amp_urls)}));
 
   LoadFromJSONString(json_str);
 
   ASSERT_THAT(service()->snippets(), SizeIs(1));
 
-  // Discarding a non-existent snippet shouldn't do anything.
-  service()->DiscardSuggestion(MakeUniqueID("http://othersite.com"));
+  // Dismissing a non-existent snippet shouldn't do anything.
+  service()->DismissSuggestion(MakeUniqueID("http://othersite.com"));
   EXPECT_THAT(service()->snippets(), SizeIs(1));
 
-  // Discard the snippet.
-  service()->DiscardSuggestion(MakeUniqueID(kSnippetUrl));
+  // Dismiss the snippet.
+  service()->DismissSuggestion(MakeUniqueID(kSnippetUrl));
   EXPECT_THAT(service()->snippets(), IsEmpty());
 
   // Make sure that fetching the same snippet again does not re-add it.
   LoadFromJSONString(json_str);
   EXPECT_THAT(service()->snippets(), IsEmpty());
 
-  // The snippet should stay discarded even after re-creating the service.
+  // The snippet should stay dismissed even after re-creating the service.
   EXPECT_CALL(mock_scheduler(), Schedule(_, _, _, _)).Times(1);
   CreateSnippetsService(/*enabled=*/true);
   LoadFromJSONString(json_str);
   EXPECT_THAT(service()->snippets(), IsEmpty());
 
-  // The snippet can be added again after clearing discarded snippets.
-  service()->ClearDiscardedSuggestionsForDebugging();
+  // The snippet can be added again after clearing dismissed snippets.
+  service()->ClearDismissedSuggestionsForDebugging();
   EXPECT_THAT(service()->snippets(), IsEmpty());
   LoadFromJSONString(json_str);
   EXPECT_THAT(service()->snippets(), SizeIs(1));
 }
 
-TEST_F(NTPSnippetsServiceTest, GetDiscarded) {
+TEST_F(NTPSnippetsServiceTest, GetDismissed) {
   LoadFromJSONString(GetTestJson({GetSnippet()}));
 
-  service()->DiscardSuggestion(MakeUniqueID(kSnippetUrl));
-  const NTPSnippet::PtrVector& snippets = service()->discarded_snippets();
+  service()->DismissSuggestion(MakeUniqueID(kSnippetUrl));
+  const NTPSnippet::PtrVector& snippets = service()->dismissed_snippets();
   EXPECT_EQ(1u, snippets.size());
   for (auto& snippet : snippets) {
     EXPECT_EQ(kSnippetUrl, snippet->id());
   }
 
-  // There should be no discarded snippet after clearing the list.
-  service()->ClearDiscardedSuggestionsForDebugging();
-  EXPECT_EQ(0u, service()->discarded_snippets().size());
+  // There should be no dismissed snippet after clearing the list.
+  service()->ClearDismissedSuggestionsForDebugging();
+  EXPECT_EQ(0u, service()->dismissed_snippets().size());
 }
 
 TEST_F(NTPSnippetsServiceTest, CreationTimestampParseFail) {
   std::string json_str(GetTestJson({GetSnippetWithTimes(
       "aaa1448459205",
       NTPSnippet::TimeToJsonString(GetDefaultExpirationTime()))}));
 
   LoadFromJSONString(json_str);
   ASSERT_THAT(service()->snippets(), SizeIs(1));
   const NTPSnippet& snippet = *service()->snippets().front();
@@ skipping 254 matching lines @@
   LoadFromJSONString(GetTestJson({GetSnippet()}));
   EXPECT_THAT(tester.GetAllSamples("NewTabPage.Snippets.NumArticles"),
               ElementsAre(base::Bucket(/*min=*/0, /*count=*/2),
                           base::Bucket(/*min=*/1, /*count=*/2)));
   EXPECT_THAT(tester.GetAllSamples("NewTabPage.Snippets.NumArticlesFetched"),
               ElementsAre(base::Bucket(/*min=*/0, /*count=*/1),
                           base::Bucket(/*min=*/1, /*count=*/2)));
   EXPECT_THAT(
       tester.GetAllSamples("NewTabPage.Snippets.NumArticlesZeroDueToDiscarded"),
       IsEmpty());
-  // Discarding a snippet should decrease the list size. This will only be
+  // Dismissing a snippet should decrease the list size. This will only be
   // logged after the next fetch.
-  service()->DiscardSuggestion(MakeUniqueID(kSnippetUrl));
+  service()->DismissSuggestion(MakeUniqueID(kSnippetUrl));
   LoadFromJSONString(GetTestJson({GetSnippet()}));
   EXPECT_THAT(tester.GetAllSamples("NewTabPage.Snippets.NumArticles"),
               ElementsAre(base::Bucket(/*min=*/0, /*count=*/3),
                           base::Bucket(/*min=*/1, /*count=*/2)));
-  // Discarded snippets shouldn't influence NumArticlesFetched.
+  // Dismissed snippets shouldn't influence NumArticlesFetched.
   EXPECT_THAT(tester.GetAllSamples("NewTabPage.Snippets.NumArticlesFetched"),
               ElementsAre(base::Bucket(/*min=*/0, /*count=*/1),
                           base::Bucket(/*min=*/1, /*count=*/3)));
   EXPECT_THAT(
       tester.GetAllSamples("NewTabPage.Snippets.NumArticlesZeroDueToDiscarded"),
       ElementsAre(base::Bucket(/*min=*/1, /*count=*/1)));
   // Recreating the service and loading from prefs shouldn't count as fetched
   // articles.
   EXPECT_CALL(mock_scheduler(), Schedule(_, _, _, _)).Times(1);
   CreateSnippetsService(/*enabled=*/true);
   tester.ExpectTotalCount("NewTabPage.Snippets.NumArticlesFetched", 4);
 }
 
-TEST_F(NTPSnippetsServiceTest, DiscardShouldRespectAllKnownUrls) {
+TEST_F(NTPSnippetsServiceTest, DismissShouldRespectAllKnownUrls) {
   const std::string creation =
       NTPSnippet::TimeToJsonString(GetDefaultCreationTime());
   const std::string expiry =
       NTPSnippet::TimeToJsonString(GetDefaultExpirationTime());
   const std::vector<std::string> source_urls = {
       "http://mashable.com/2016/05/11/stolen",
       "http://www.aol.com/article/2016/05/stolen-doggie",
       "http://mashable.com/2016/05/11/stolen?utm_cid=1"};
   const std::vector<std::string> publishers = {"Mashable", "AOL", "Mashable"};
   const std::vector<std::string> amp_urls = {
       "http://mashable-amphtml.googleusercontent.com/1",
       "http://t2.gstatic.com/images?q=tbn:3",
       "http://t2.gstatic.com/images?q=tbn:3"};
 
   // Add the snippet from the mashable domain.
   LoadFromJSONString(GetTestJson({GetSnippetWithUrlAndTimesAndSources(
       source_urls[0], creation, expiry, source_urls, publishers, amp_urls)}));
   ASSERT_THAT(service()->snippets(), SizeIs(1));
-  // Discard the snippet via the mashable source corpus ID.
-  service()->DiscardSuggestion(MakeUniqueID(source_urls[0]));
+  // Dismiss the snippet via the mashable source corpus ID.
+  service()->DismissSuggestion(MakeUniqueID(source_urls[0]));
   EXPECT_THAT(service()->snippets(), IsEmpty());
 
-  // The same article from the AOL domain should now be detected as discarded.
+  // The same article from the AOL domain should now be detected as dismissed.
   LoadFromJSONString(GetTestJson({GetSnippetWithUrlAndTimesAndSources(
       source_urls[1], creation, expiry, source_urls, publishers, amp_urls)}));
   ASSERT_THAT(service()->snippets(), IsEmpty());
 }
 
 TEST_F(NTPSnippetsServiceTest, HistorySyncStateChanges) {
   MockServiceObserver mock_observer;
   service()->AddObserver(&mock_observer);
 
   // Simulate user signed out
@@ skipping 12 matching lines @@
   EXPECT_CALL(mock_scheduler(), Schedule(_, _, _, _)).Times(1);
   service()->OnDisabledReasonChanged(DisabledReason::NONE);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(NTPSnippetsService::State::READY, service()->state_);
   EXPECT_FALSE(service()->snippets().empty());
 
   service()->RemoveObserver(&mock_observer);
 }
 
 }  // namespace ntp_snippets