Revert of Add per-section clearing and dismissed suggestions to snippets-internals

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 15 matching lines @@
 #include "components/ntp_snippets/switches.h"
 #include "content/public/browser/web_ui.h"
 
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::Category;
 using ntp_snippets::CategoryStatus;
 using ntp_snippets::KnownCategories;
 
 namespace {
 
+std::unique_ptr<base::DictionaryValue> PrepareSnippet(
+    const ntp_snippets::NTPSnippet& snippet,
+    int index,
+    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 (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>();
   entry->SetString("suggestionId", suggestion.id());
   entry->SetString("url", suggestion.url().spec());
   entry->SetString("ampUrl", suggestion.amp_url().spec());
   entry->SetString("title", suggestion.title());
   entry->SetString("snippetText", suggestion.snippet_text());
   entry->SetString("publishDate",
@@ skipping 42 matching lines @@
 } // namespace
 
 SnippetsInternalsMessageHandler::SnippetsInternalsMessageHandler()
     : content_suggestions_service_observer_(this),
       dom_loaded_(false),
       ntp_snippets_service_(nullptr),
       content_suggestions_service_(nullptr) {}
 
 SnippetsInternalsMessageHandler::~SnippetsInternalsMessageHandler() {}
 
-void SnippetsInternalsMessageHandler::RegisterMessages() {
-  // additional initialization (web_ui() does not work from the constructor)
-  Profile* profile = Profile::FromWebUI(web_ui());
-
-  content_suggestions_service_ =
-      ContentSuggestionsServiceFactory::GetInstance()->GetForProfile(profile);
-  content_suggestions_service_observer_.Add(content_suggestions_service_);
-
-  ntp_snippets_service_ = content_suggestions_service_->ntp_snippets_service();
-
-  web_ui()->RegisterMessageCallback(
-      "refreshContent",
-      base::Bind(&SnippetsInternalsMessageHandler::HandleRefreshContent,
-                 base::Unretained(this)));
-
-  web_ui()->RegisterMessageCallback(
-      "download", base::Bind(&SnippetsInternalsMessageHandler::HandleDownload,
-                             base::Unretained(this)));
-
-  web_ui()->RegisterMessageCallback(
-      "clearCachedSuggestions",
-      base::Bind(&SnippetsInternalsMessageHandler::HandleClearCachedSuggestions,
-                 base::Unretained(this)));
-
-  web_ui()->RegisterMessageCallback(
-      "clearDismissedSuggestions",
-      base::Bind(
-          &SnippetsInternalsMessageHandler::HandleClearDismissedSuggestions,
-          base::Unretained(this)));
-}
-
 void SnippetsInternalsMessageHandler::OnNewSuggestions() {
   if (!dom_loaded_)
     return;
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::OnCategoryStatusChanged(
     Category category,
     CategoryStatus new_status) {
   if (!dom_loaded_)
     return;
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::ContentSuggestionsServiceShutdown() {}
 
+void SnippetsInternalsMessageHandler::RegisterMessages() {
+  // additional initialization (web_ui() does not work from the constructor)
+  Profile* profile = Profile::FromWebUI(web_ui());
+
+  content_suggestions_service_ =
+      ContentSuggestionsServiceFactory::GetInstance()->GetForProfile(profile);
+  content_suggestions_service_observer_.Add(content_suggestions_service_);
+
+  ntp_snippets_service_ = content_suggestions_service_->ntp_snippets_service();
+
+  web_ui()->RegisterMessageCallback(
+      "refreshContent",
+      base::Bind(&SnippetsInternalsMessageHandler::HandleRefreshContent,
+                 base::Unretained(this)));
+
+  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(
+      "clearDismissed",
+      base::Bind(&SnippetsInternalsMessageHandler::HandleClearDismissed,
+                 base::Unretained(this)));
+
+  web_ui()->RegisterMessageCallback(
+      "clearCachedSuggestions",
+      base::Bind(&SnippetsInternalsMessageHandler::HandleClearCachedSuggestions,
+                 base::Unretained(this)));
+
+  web_ui()->RegisterMessageCallback(
+      "clearDismissedSuggestions",
+      base::Bind(
+          &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::HandleClearDismissed(
+    const base::ListValue* args) {
+  DCHECK_EQ(0u, args->GetSize());
+
+  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;
-  DCHECK(args->GetString(0, &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, /*force_requests=*/true);
 }
 
 void SnippetsInternalsMessageHandler::HandleClearCachedSuggestions(
     const base::ListValue* args) {
-  DCHECK_EQ(1u, args->GetSize());
+  DCHECK_EQ(0u, args->GetSize());
 
-  int category_id;
-  DCHECK(args->GetInteger(0, &category_id));
-  Category category =
-      content_suggestions_service_->category_factory()->FromIDValue(
-          category_id);
-  content_suggestions_service_->ClearCachedSuggestionsForDebugging(category);
-  SendContentSuggestions();
+  content_suggestions_service_->ClearCachedSuggestionsForDebugging();
 }
 
 void SnippetsInternalsMessageHandler::HandleClearDismissedSuggestions(
     const base::ListValue* args) {
-  DCHECK_EQ(1u, args->GetSize());
+  DCHECK_EQ(0u, args->GetSize());
 
-  int category_id;
-  DCHECK(args->GetInteger(0, &category_id));
-  Category category =
-      content_suggestions_service_->category_factory()->FromIDValue(
-          category_id);
-  content_suggestions_service_->ClearDismissedSuggestionsForDebugging(category);
-  SendContentSuggestions();
+  content_suggestions_service_->ClearDismissedSuggestionsForDebugging();
 }
 
 void SnippetsInternalsMessageHandler::SendAllContent() {
   SendHosts();
 
   SendBoolean("flag-snippets", base::FeatureList::IsEnabled(
                                    ntp_snippets::kContentSuggestionsFeature));
 
   SendBoolean("flag-offline-page-suggestions",
               base::FeatureList::IsEnabled(
@@ skipping 17 matching lines @@
       break;
   }
 
   SendString("switch-fetch-url",
              ntp_snippets_service_->snippets_fetcher()->fetch_url().spec());
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveJson",
       base::StringValue(
           ntp_snippets_service_->snippets_fetcher()->last_json()));
 
+  SendSnippets();
+  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::SendDismissedSnippets() {
+  std::unique_ptr<base::ListValue> snippets_list(new base::ListValue);
+
+  int index = 0;
+  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.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);
 
     hosts_list->Append(std::move(entry));
   }
 
   base::DictionaryValue result;
   result.Set("list", std::move(hosts_list));
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveHosts", result);
 }
 
 void SnippetsInternalsMessageHandler::SendContentSuggestions() {
   std::unique_ptr<base::ListValue> categories_list(new base::ListValue);
 
   int index = 0;
   for (Category category : content_suggestions_service_->GetCategories()) {
     CategoryStatus status =
         content_suggestions_service_->GetCategoryStatus(category);
     const std::vector<ContentSuggestion>& suggestions =
         content_suggestions_service_->GetSuggestionsForCategory(category);
-    std::vector<ContentSuggestion> dismissed_suggestions =
-        content_suggestions_service_->GetDismissedSuggestionsForDebugging(
-            category);
 
     std::unique_ptr<base::ListValue> suggestions_list(new base::ListValue);
     for (const ContentSuggestion& suggestion : suggestions) {
       suggestions_list->Append(PrepareSuggestion(suggestion, index++));
     }
 
-    std::unique_ptr<base::ListValue> dismissed_list(new base::ListValue);
-    for (const ContentSuggestion& suggestion : dismissed_suggestions) {
-      dismissed_list->Append(PrepareSuggestion(suggestion, index++));
-    }
-
     std::unique_ptr<base::DictionaryValue> category_entry(
         new base::DictionaryValue);
-    category_entry->SetInteger("categoryId", category.id());
-    category_entry->SetString(
-        "dismissedContainerId",
-        "dismissed-suggestions-" + base::IntToString(category.id()));
     category_entry->SetString("title", GetCategoryTitle(category));
     category_entry->SetString("status", GetCategoryStatusName(status));
     category_entry->Set("suggestions", std::move(suggestions_list));
-    category_entry->Set("dismissedSuggestions", std::move(dismissed_list));
     categories_list->Append(std::move(category_entry));
   }
 
   base::DictionaryValue result;
   result.Set("list", std::move(categories_list));
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveContentSuggestions", result);
 }
 
 void SnippetsInternalsMessageHandler::SendBoolean(const std::string& name,
                                                   bool value) {
   SendString(name, value ? "True" : "False");
 }
 
 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);
 }