Add ContentSuggestionsCategoryFactory; Store categories as ints

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 11 matching lines @@
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/ntp_snippets/ntp_snippet.h"
 #include "components/ntp_snippets/switches.h"
 #include "content/public/browser/web_ui.h"
 
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::ContentSuggestionsCategory;
 using ntp_snippets::ContentSuggestionsCategoryStatus;
+using ntp_snippets::KnownSuggestionsCategories;
 
 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());
@@ skipping 25 matching lines @@
   entry->SetString("ampUrl", suggestion.amp_url().spec());
   entry->SetString("title", suggestion.title());
   entry->SetString("snippetText", suggestion.snippet_text());
   entry->SetString("publishDate",
                    TimeFormatShortDateAndTime(suggestion.publish_date()));
   entry->SetString("publisherName", suggestion.publisher_name());
   entry->SetString("id", "content-suggestion-" + base::IntToString(index));
   return entry;
 }
 
-std::string MapCategoryName(ContentSuggestionsCategory category) {
-  switch (category) {
-    case ContentSuggestionsCategory::ARTICLES:
-      return "Articles";
-    case ContentSuggestionsCategory::OFFLINE_PAGES:
-      return "Offline pages (continue browsing)";
-    case ContentSuggestionsCategory::COUNT:
-      NOTREACHED() << "Category::COUNT must not be used as a value";
+// TODO(pke): Replace this as soon as the service delivers the title directly.
+std::string GetCategoryTitle(ContentSuggestionsCategory category) {
+  if (category.IsKnownCategory(KnownSuggestionsCategories::ARTICLES)) {
+    return "Articles";
+  }
+  if (category.IsKnownCategory(KnownSuggestionsCategories::OFFLINE_PAGES)) {
+    return "Offline pages (continue browsing)";
   }
   return std::string();
 }
 
-std::string MapCategoryStatus(ContentSuggestionsCategoryStatus status) {
+std::string GetCategoryStatusName(ContentSuggestionsCategoryStatus status) {
   switch (status) {
     case ContentSuggestionsCategoryStatus::INITIALIZING:
       return "INITIALIZING";
     case ContentSuggestionsCategoryStatus::AVAILABLE:
       return "AVAILABLE";
     case ContentSuggestionsCategoryStatus::AVAILABLE_LOADING:
       return "AVAILABLE_LOADING";
     case ContentSuggestionsCategoryStatus::NOT_PROVIDED:
       return "NOT_PROVIDED";
     case ContentSuggestionsCategoryStatus::ALL_SUGGESTIONS_EXPLICITLY_DISABLED:
@@ skipping 249 matching lines @@
     const std::vector<ContentSuggestion>& suggestions =
         content_suggestions_service_->GetSuggestionsForCategory(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::DictionaryValue> category_entry(
         new base::DictionaryValue);
-    category_entry->SetString("name", MapCategoryName(category));
-    category_entry->SetString("status", MapCategoryStatus(status));
+    category_entry->SetString("title", GetCategoryTitle(category));
+    category_entry->SetString("status", GetCategoryStatusName(status));
     category_entry->Set("suggestions", std::move(suggestions_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);
 }