Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/ntp_snippet.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_NTP_SNIPPET_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPET_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 104 matching lines @@
   bool is_complete() const {
     return !id().empty() && !sources().empty() && !title().empty() &&
            !snippet().empty() && salient_image_url().is_valid() &&
            !publish_date().is_null() && !expiry_date().is_null() &&
            !best_source().publisher_name.empty();
   }
 
   float score() const { return score_; }
   void set_score(float score) { score_ = score; }
 
-  bool is_discarded() const { return is_discarded_; }
-  void set_discarded(bool discarded) { is_discarded_ = discarded; }
+  bool is_dismissed() const { return is_dismissed_; }
+  void set_dismissed(bool dismissed) { is_dismissed_ = dismissed; }
 
   // Public for testing.
   static base::Time TimeFromJsonString(const std::string& timestamp_str);
   static std::string TimeToJsonString(const base::Time& time);
 
  private:
   void FindBestSource();
 
   std::string id_;
   std::string title_;
   GURL salient_image_url_;
   std::string snippet_;
   base::Time publish_date_;
   base::Time expiry_date_;
   float score_;
-  bool is_discarded_;
+  bool is_dismissed_;
 
   size_t best_source_index_;
 
   std::vector<SnippetSource> sources_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippet);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPET_H_