Rename discard to dismiss for NTP snippets and content suggestions

chrome/browser/ui/webui/snippets_internals_message_handler.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 "chrome/browser/ui/webui/snippets_internals_message_handler.h"
 
 #include <memory>
 #include <set>
 #include <vector>
 
@@ skipping 17 matching lines @@
 
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::ContentSuggestionsCategory;
 using ntp_snippets::ContentSuggestionsCategoryStatus;
 
 namespace {
 
 std::unique_ptr<base::DictionaryValue> PrepareSnippet(
     const ntp_snippets::NTPSnippet& snippet,
     int index,
-    bool discarded) {
+    bool dismissed) {
   std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
   entry->SetString("snippetId", snippet.id());
   entry->SetString("title", snippet.title());
   entry->SetString("siteTitle", snippet.best_source().publisher_name);
   entry->SetString("snippet", snippet.snippet());
   entry->SetString("published",
                    TimeFormatShortDateAndTime(snippet.publish_date()));
   entry->SetString("expires",
                    TimeFormatShortDateAndTime(snippet.expiry_date()));
   entry->SetString("url", snippet.best_source().url.spec());
   entry->SetString("ampUrl", snippet.best_source().amp_url.spec());
   entry->SetString("salientImageUrl", snippet.salient_image_url().spec());
   entry->SetDouble("score", snippet.score());
 
-  if (discarded)
-    entry->SetString("id", "discarded-snippet-" + base::IntToString(index));
+  if (dismissed)
+    entry->SetString("id", "dismissed-snippet-" + base::IntToString(index));
   else
     entry->SetString("id", "snippet-" + base::IntToString(index));
 
   return entry;
 }
 
 std::unique_ptr<base::DictionaryValue> PrepareSuggestion(
     const ContentSuggestion& suggestion,
     int index) {
   auto entry = base::MakeUnique<base::DictionaryValue>();
@@ skipping 111 matching lines @@
 
   web_ui()->RegisterMessageCallback(
       "clear", base::Bind(&SnippetsInternalsMessageHandler::HandleClear,
                           base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
       "download", base::Bind(&SnippetsInternalsMessageHandler::HandleDownload,
                              base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
-      "clearDiscarded",
-      base::Bind(&SnippetsInternalsMessageHandler::HandleClearDiscarded,
+      "clearDismissed",
+      base::Bind(&SnippetsInternalsMessageHandler::HandleClearDismissed,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
       "clearCachedSuggestions",
       base::Bind(&SnippetsInternalsMessageHandler::HandleClearCachedSuggestions,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
-      "clearDiscardedSuggestions",
+      "clearDismissedSuggestions",
       base::Bind(
-          &SnippetsInternalsMessageHandler::HandleClearDiscardedSuggestions,
+          &SnippetsInternalsMessageHandler::HandleClearDismissedSuggestions,
           base::Unretained(this)));
 }
 
 void SnippetsInternalsMessageHandler::HandleRefreshContent(
     const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
   dom_loaded_ = true;
 
   SendAllContent();
 }
 
 void SnippetsInternalsMessageHandler::HandleClear(const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
   ntp_snippets_service_->ClearCachedSuggestionsForDebugging();
 }
 
-void SnippetsInternalsMessageHandler::HandleClearDiscarded(
+void SnippetsInternalsMessageHandler::HandleClearDismissed(
     const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
-  ntp_snippets_service_->ClearDiscardedSuggestionsForDebugging();
-  SendDiscardedSnippets();
+  ntp_snippets_service_->ClearDismissedSuggestionsForDebugging();
+  SendDismissedSnippets();
 }
 
 void SnippetsInternalsMessageHandler::HandleDownload(
     const base::ListValue* args) {
   DCHECK_EQ(1u, args->GetSize());
 
   SendString("hosts-status", std::string());
 
   std::string hosts_string;
   args->GetString(0, &hosts_string);
 
   std::vector<std::string> hosts_vector = base::SplitString(
       hosts_string, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   std::set<std::string> hosts(hosts_vector.begin(), hosts_vector.end());
 
   ntp_snippets_service_->FetchSnippetsFromHosts(hosts);
 }
 
 void SnippetsInternalsMessageHandler::HandleClearCachedSuggestions(
     const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
   content_suggestions_service_->ClearCachedSuggestionsForDebugging();
 }
 
-void SnippetsInternalsMessageHandler::HandleClearDiscardedSuggestions(
+void SnippetsInternalsMessageHandler::HandleClearDismissedSuggestions(
     const base::ListValue* args) {
   DCHECK_EQ(0u, args->GetSize());
 
-  content_suggestions_service_->ClearDiscardedSuggestionsForDebugging();
+  content_suggestions_service_->ClearDismissedSuggestionsForDebugging();
 }
 
 void SnippetsInternalsMessageHandler::SendAllContent() {
   SendHosts();
 
   SendBoolean("flag-snippets", base::FeatureList::IsEnabled(
                                    chrome::android::kNTPSnippetsFeature));
 
   SendBoolean("flag-offline-page-suggestions",
               base::FeatureList::IsEnabled(
@@ skipping 14 matching lines @@
       break;
     case ntp_snippets::NTPSnippetsFetcher::Personalization::kNonPersonal:
       SendString("switch-personalized", "Only non-personalized");
       break;
   }
 
   SendString("switch-fetch-url",
              ntp_snippets_service_->snippets_fetcher()->fetch_url().spec());
 
   SendSnippets();
-  SendDiscardedSnippets();
+  SendDismissedSnippets();
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::SendSnippets() {
   std::unique_ptr<base::ListValue> snippets_list(new base::ListValue);
 
   int index = 0;
   for (const std::unique_ptr<ntp_snippets::NTPSnippet>& snippet :
        ntp_snippets_service_->snippets())
     snippets_list->Append(PrepareSnippet(*snippet, index++, false));
 
   base::DictionaryValue result;
   result.Set("list", std::move(snippets_list));
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveSnippets", result);
 
   const std::string& status =
       ntp_snippets_service_->snippets_fetcher()->last_status();
   if (!status.empty())
     SendString("hosts-status", "Finished: " + status);
 }
 
-void SnippetsInternalsMessageHandler::SendDiscardedSnippets() {
+void SnippetsInternalsMessageHandler::SendDismissedSnippets() {
   std::unique_ptr<base::ListValue> snippets_list(new base::ListValue);
 
   int index = 0;
-  for (const auto& snippet : ntp_snippets_service_->discarded_snippets())
+  for (const auto& snippet : ntp_snippets_service_->dismissed_snippets())
     snippets_list->Append(PrepareSnippet(*snippet, index++, true));
 
   base::DictionaryValue result;
   result.Set("list", std::move(snippets_list));
   web_ui()->CallJavascriptFunctionUnsafe(
-      "chrome.SnippetsInternals.receiveDiscardedSnippets", result);
+      "chrome.SnippetsInternals.receiveDismissedSnippets", result);
 }
 
 void SnippetsInternalsMessageHandler::SendHosts() {
   std::unique_ptr<base::ListValue> hosts_list(new base::ListValue);
 
   std::set<std::string> hosts = ntp_snippets_service_->GetSuggestionsHosts();
 
   for (const std::string& host : hosts) {
     std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
     entry->SetString("url", host);
@@ skipping 43 matching lines @@
 }
 
 void SnippetsInternalsMessageHandler::SendString(const std::string& name,
                                                  const std::string& value) {
   base::StringValue string_name(name);
   base::StringValue string_value(value);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveProperty", string_name, string_value);
 }