Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/content_suggestions_service_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/content_suggestions_service.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 68 matching lines @@
     statuses_[category] = new_status;
     observer_->OnCategoryStatusChanged(category, new_status);
   }
 
   void FireShutdown() {
     observer_->OnProviderShutdown(this);
     observer_ = nullptr;
   }
 
   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));
 
  private:
   Observer* observer_;
   std::map<ContentSuggestionsCategory, ContentSuggestionsCategoryStatus>
       statuses_;
 };
 
@@ skipping 197 matching lines @@
 TEST_F(ContentSuggestionsServiceTest,
        ShouldCallbackEmptyImageForUnavailableProvider) {
   std::string suggestion_id = "TestID";
   EXPECT_CALL(*this, OnImageFetched(suggestion_id,
                                     Property(&gfx::Image::IsEmpty, Eq(true))));
   service()->FetchSuggestionImage(
       suggestion_id, base::Bind(&ContentSuggestionsServiceTest::OnImageFetched,
                                 base::Unretained(this)));
 }
 
-TEST_F(ContentSuggestionsServiceTest, ShouldRedirectDiscardSuggestion) {
+TEST_F(ContentSuggestionsServiceTest, ShouldRedirectDismissSuggestion) {
   MockProvider provider1(ContentSuggestionsCategory::ARTICLES);
   MockProvider provider2(ContentSuggestionsCategory::OFFLINE_PAGES);
   service()->RegisterProvider(&provider1);
   service()->RegisterProvider(&provider2);
 
   provider2.FireSuggestionsChanged(ContentSuggestionsCategory::OFFLINE_PAGES,
                                    {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();
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldForwardSuggestions) {
   // Create and register providers
   MockProvider provider1(ContentSuggestionsCategory::ARTICLES);
   MockProvider provider2(ContentSuggestionsCategory::OFFLINE_PAGES);
   service()->RegisterProvider(&provider1);
   service()->RegisterProvider(&provider2);
@@ skipping 87 matching lines @@
       Eq(ContentSuggestionsCategoryStatus::NOT_PROVIDED));
 
   // Shutdown the service
   EXPECT_CALL(observer, ContentSuggestionsServiceShutdown());
   service()->Shutdown();
   service()->RemoveObserver(&observer);
   // The service will receive two Shutdown() calls.
 }
 
 }  // namespace ntp_snippets