Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/content_suggestions_service.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 74 matching lines @@
   // for any reason, see |GetCategoryStatus()|.
   const std::vector<ContentSuggestion>& GetSuggestionsForCategory(
       ContentSuggestionsCategory category) const;
 
   // Fetches the image for the suggestion with the given |suggestion_id| and
   // runs the |callback|. If that suggestion doesn't exist or the fetch fails,
   // the callback gets an empty image.
   void FetchSuggestionImage(const std::string& suggestion_id,
                             const ImageFetchedCallback& callback);
 
-  // Discards the suggestion with the given |suggestion_id|, if it exists.
+  // Dismisses the suggestion with the given |suggestion_id|, if it exists.
   // This will not trigger an update through the observers.
-  void DiscardSuggestion(const std::string& suggestion_id);
+  void DismissSuggestion(const std::string& suggestion_id);
 
   // Observer accessors.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Registers a new ContentSuggestionsProvider. It must be ensured that at most
   // one provider is registered for every category and that this method is
   // called only once per provider.
   void RegisterProvider(ContentSuggestionsProvider* provider);
 
   // Only for debugging use through the internals page.
   // Removes all suggestions from all caches or internal stores in all
   // providers. It does, however, not remove any suggestions from the provider's
   // sources, so if their configuration hasn't changed, they should return the
   // same results when they fetch the next time. In particular, calling this
-  // method will not mark any suggestions as discarded.
+  // method will not mark any suggestions as dismissed.
   void ClearCachedSuggestionsForDebugging();
 
   // Only for debugging use through the internals page. Some providers
-  // internally store a list of discarded suggestions to prevent them from
+  // internally store a list of dismissed suggestions to prevent them from
   // reappearing. This function clears all such lists in all providers, making
-  // discarded suggestions reappear (only for certain providers).
-  void ClearDiscardedSuggestionsForDebugging();
+  // dismissed suggestions reappear (only for certain providers).
+  void ClearDismissedSuggestionsForDebugging();
 
  private:
   friend class ContentSuggestionsServiceTest;
 
   // Implementation of ContentSuggestionsProvider::Observer.
   void OnNewSuggestions(ContentSuggestionsCategory changed_category,
                         std::vector<ContentSuggestion> suggestions) override;
   void OnCategoryStatusChanged(
       ContentSuggestionsCategory changed_category,
       ContentSuggestionsCategoryStatus new_status) override;
@@ skipping 34 matching lines @@
   base::ObserverList<Observer> observers_;
 
   const std::vector<ContentSuggestion> no_suggestions_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSuggestionsService);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_