Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/ntp_snippet.cc

 // 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.
 
 #include "components/ntp_snippets/ntp_snippet.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ skipping 21 matching lines @@
   }
   *url = GURL(spec);
   return url->is_valid();
 }
 
 }  // namespace
 
 namespace ntp_snippets {
 
 NTPSnippet::NTPSnippet(const std::string& id)
-    : id_(id), score_(0), is_discarded_(false), best_source_index_(0) {}
+    : id_(id), score_(0), is_dismissed_(false), best_source_index_(0) {}
 
 NTPSnippet::~NTPSnippet() {}
 
 // static
 std::unique_ptr<NTPSnippet> NTPSnippet::CreateFromChromeReaderDictionary(
     const base::DictionaryValue& dict) {
   const base::DictionaryValue* content = nullptr;
   if (!dict.GetDictionary("contentInfo", &content))
     return nullptr;
 
@@ skipping 124 matching lines @@
 
   std::unique_ptr<NTPSnippet> snippet(new NTPSnippet(proto.id()));
 
   snippet->set_title(proto.title());
   snippet->set_snippet(proto.snippet());
   snippet->set_salient_image_url(GURL(proto.salient_image_url()));
   snippet->set_publish_date(
       base::Time::FromInternalValue(proto.publish_date()));
   snippet->set_expiry_date(base::Time::FromInternalValue(proto.expiry_date()));
   snippet->set_score(proto.score());
-  snippet->set_discarded(proto.discarded());
+  snippet->set_dismissed(proto.dismissed());
 
   for (int i = 0; i < proto.sources_size(); ++i) {
     const SnippetSourceProto& source_proto = proto.sources(i);
     GURL url(source_proto.url());
     if (!url.is_valid()) {
       // We must at least have a valid source URL.
       DLOG(WARNING) << "Invalid article url " << source_proto.url();
       continue;
     }
     std::string publisher_name = source_proto.publisher_name();
@@ skipping 25 matching lines @@
     result.set_title(title_);
   if (!snippet_.empty())
     result.set_snippet(snippet_);
   if (salient_image_url_.is_valid())
     result.set_salient_image_url(salient_image_url_.spec());
   if (!publish_date_.is_null())
     result.set_publish_date(publish_date_.ToInternalValue());
   if (!expiry_date_.is_null())
     result.set_expiry_date(expiry_date_.ToInternalValue());
   result.set_score(score_);
-  result.set_discarded(is_discarded_);
+  result.set_dismissed(is_dismissed_);
 
   for (const SnippetSource& source : sources_) {
     SnippetSourceProto* source_proto = result.add_sources();
     source_proto->set_url(source.url.spec());
     if (!source.publisher_name.empty())
       source_proto->set_publisher_name(source.publisher_name);
     if (source.amp_url.is_valid())
       source_proto->set_amp_url(source.amp_url.spec());
   }
 
@@ skipping 32 matching lines @@
       best_source_index_ = i;
       if (!source.amp_url.is_empty()) {
         // This is the best possible source, stop looking.
         break;
       }
     }
   }
 }
 
 }  // namespace ntp_snippets