Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/content_suggestions_service.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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 59 matching lines @@
 
 void ContentSuggestionsService::ClearCachedSuggestionsForDebugging() {
   suggestions_by_category_.clear();
   id_category_map_.clear();
   for (auto& category_provider_pair : providers_) {
     category_provider_pair.second->ClearCachedSuggestionsForDebugging();
   }
   FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions());
 }
 
-void ContentSuggestionsService::ClearDiscardedSuggestionsForDebugging() {
+void ContentSuggestionsService::ClearDismissedSuggestionsForDebugging() {
   for (auto& category_provider_pair : providers_) {
-    category_provider_pair.second->ClearDiscardedSuggestionsForDebugging();
+    category_provider_pair.second->ClearDismissedSuggestionsForDebugging();
   }
 }
 
-void ContentSuggestionsService::DiscardSuggestion(
+void ContentSuggestionsService::DismissSuggestion(
     const std::string& suggestion_id) {
   if (!id_category_map_.count(suggestion_id)) {
-    LOG(WARNING) << "Discarded unknown suggestion " << suggestion_id;
+    LOG(WARNING) << "Dismissed unknown suggestion " << suggestion_id;
     return;
   }
   ContentSuggestionsCategory category = id_category_map_[suggestion_id];
   if (!providers_.count(category)) {
-    LOG(WARNING) << "Discarded suggestion " << suggestion_id
+    LOG(WARNING) << "Dismissed suggestion " << suggestion_id
                  << " for unavailable category " << static_cast<int>(category);
     return;
   }
-  providers_[category]->DiscardSuggestion(suggestion_id);
+  providers_[category]->DismissSuggestion(suggestion_id);
 
   // Remove the suggestion locally.
   id_category_map_.erase(suggestion_id);
   std::vector<ContentSuggestion>* suggestions =
       &suggestions_by_category_[category];
   auto position =
       std::find_if(suggestions->begin(), suggestions->end(),
                    [&suggestion_id](const ContentSuggestion& suggestion) {
                      return suggestion_id == suggestion.id();
                    });
   DCHECK(position != suggestions->end())
-      << "The discarded suggestion " << suggestion_id
+      << "The dismissed suggestion " << suggestion_id
       << " has already been removed. Providers must not call OnNewSuggestions"
-         " in response to DiscardSuggestion.";
+         " in response to DismissSuggestion.";
   suggestions->erase(position);
 }
 
 void ContentSuggestionsService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ContentSuggestionsService::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
@@ skipping 78 matching lines @@
 }
 
 void ContentSuggestionsService::NotifyCategoryStatusChanged(
     ContentSuggestionsCategory category) {
   FOR_EACH_OBSERVER(
       Observer, observers_,
       OnCategoryStatusChanged(category, GetCategoryStatus(category)));
 }
 
 }  // namespace ntp_snippets