Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/content_suggestions_service_unittest.cc

Index: components/ntp_snippets/content_suggestions_service_unittest.cc
diff --git a/components/ntp_snippets/content_suggestions_service_unittest.cc b/components/ntp_snippets/content_suggestions_service_unittest.cc
index 6d5d85b50b0b7c483d134371fe6c99d62bde398d..02bbdbd82247588ff2e323add95d2a4810a745c0 100644
--- a/components/ntp_snippets/content_suggestions_service_unittest.cc
+++ b/components/ntp_snippets/content_suggestions_service_unittest.cc
@@ -86,8 +86,8 @@ class MockProvider : public ContentSuggestionsProvider {
   }
 
   MOCK_METHOD0(ClearCachedSuggestionsForDebugging, void());
-  MOCK_METHOD0(ClearDiscardedSuggestionsForDebugging, void());
-  MOCK_METHOD1(DiscardSuggestion, void(const std::string& suggestion_id));
+  MOCK_METHOD0(ClearDismissedSuggestionsForDebugging, void());
+  MOCK_METHOD1(DismissSuggestion, void(const std::string& suggestion_id));
   MOCK_METHOD2(FetchSuggestionImage,
                void(const std::string& suggestion_id,
                     const ImageFetchedCallback& callback));
@@ -305,7 +305,7 @@ TEST_F(ContentSuggestionsServiceTest,
                                 base::Unretained(this)));
 }
 
-TEST_F(ContentSuggestionsServiceTest, ShouldRedirectDiscardSuggestion) {
+TEST_F(ContentSuggestionsServiceTest, ShouldRedirectDismissSuggestion) {
   MockProvider provider1(ContentSuggestionsCategory::ARTICLES);
   MockProvider provider2(ContentSuggestionsCategory::OFFLINE_PAGES);
   service()->RegisterProvider(&provider1);
@@ -315,9 +315,9 @@ TEST_F(ContentSuggestionsServiceTest, ShouldRedirectDiscardSuggestion) {
                                    {11});
   std::string suggestion_id = CreateSuggestion(11).id();
 
-  EXPECT_CALL(provider1, DiscardSuggestion(_)).Times(0);
-  EXPECT_CALL(provider2, DiscardSuggestion(suggestion_id)).Times(1);
-  service()->DiscardSuggestion(suggestion_id);
+  EXPECT_CALL(provider1, DismissSuggestion(_)).Times(0);
+  EXPECT_CALL(provider2, DismissSuggestion(suggestion_id)).Times(1);
+  service()->DismissSuggestion(suggestion_id);
   provider1.FireShutdown();
   provider2.FireShutdown();
 }