Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/ntp_snippets_database_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/ntp_snippets_database.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 19 matching lines @@
 }
 
 bool operator==(const NTPSnippet& lhs, const NTPSnippet& rhs) {
   return lhs.id() == rhs.id() && lhs.title() == rhs.title() &&
          lhs.snippet() == rhs.snippet() &&
          lhs.salient_image_url() == rhs.salient_image_url() &&
          lhs.publish_date() == rhs.publish_date() &&
          lhs.expiry_date() == rhs.expiry_date() &&
          lhs.source_index() == rhs.source_index() &&
          lhs.sources() == rhs.sources() && lhs.score() == rhs.score() &&
-         lhs.is_discarded() == rhs.is_discarded();
+         lhs.is_dismissed() == rhs.is_dismissed();
 }
 
 namespace {
 
 std::unique_ptr<NTPSnippet> CreateTestSnippet() {
   std::unique_ptr<NTPSnippet> snippet(new NTPSnippet("http://localhost"));
   snippet->add_source(
       SnippetSource(GURL("http://localhost"), "Publisher", GURL("http://amp")));
   return snippet;
 }
@@ skipping 229 matching lines @@
 
   // Make sure the image is gone.
   EXPECT_CALL(*this, OnImageLoaded(std::string()));
   db()->LoadImage(snippet->id(),
                   base::Bind(&NTPSnippetsDatabaseTest::OnImageLoaded,
                              base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace ntp_snippets