[NTP::SectionOrder] Replace CategoryFactory with a category ranker.

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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
+#include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/features.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/ntp_snippets/remote/remote_suggestions_provider.h"
 #include "components/ntp_snippets/switches.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"
 
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::Category;
@@ skipping 162 matching lines @@
 }
 
 void SnippetsInternalsMessageHandler::HandleClearCachedSuggestions(
     const base::ListValue* args) {
   DCHECK_EQ(1u, args->GetSize());
 
   int category_id;
   if (!args->GetInteger(0, &category_id))
     return;
 
-  Category category =
-      content_suggestions_service_->category_factory()->FromIDValue(
-          category_id);
-  content_suggestions_service_->ClearCachedSuggestions(category);
+  content_suggestions_service_->ClearCachedSuggestions(
+      Category::FromIDValue(category_id));
   SendContentSuggestions();
 }
 
 void SnippetsInternalsMessageHandler::HandleClearDismissedSuggestions(
     const base::ListValue* args) {
   DCHECK_EQ(1u, args->GetSize());
 
   int category_id;
   if (!args->GetInteger(0, &category_id))
     return;
 
-  Category category =
-      content_suggestions_service_->category_factory()->FromIDValue(
-          category_id);
+  Category category = Category::FromIDValue(category_id);
   content_suggestions_service_->ClearDismissedSuggestionsForDebugging(category);
   SendContentSuggestions();
   dismissed_state_[category] = DismissedState::LOADING;
   content_suggestions_service_->GetDismissedSuggestionsForDebugging(
       category,
       base::Bind(&SnippetsInternalsMessageHandler::OnDismissedSuggestionsLoaded,
                  weak_ptr_factory_.GetWeakPtr(), category));
 }
 
 void SnippetsInternalsMessageHandler::HandleToggleDismissedSuggestions(
     const base::ListValue* args) {
   DCHECK_EQ(2u, args->GetSize());
 
   int category_id;
   if (!args->GetInteger(0, &category_id))
     return;
   bool dismissed_visible;
   if (!args->GetBoolean(1, &dismissed_visible))
     return;
 
-  Category category =
-      content_suggestions_service_->category_factory()->FromIDValue(
-          category_id);
+  Category category = Category::FromIDValue(category_id);
   if (dismissed_visible) {
     dismissed_state_[category] = DismissedState::LOADING;
     content_suggestions_service_->GetDismissedSuggestionsForDebugging(
         category,
         base::Bind(
             &SnippetsInternalsMessageHandler::OnDismissedSuggestionsLoaded,
             weak_ptr_factory_.GetWeakPtr(), category));
   } else {
     dismissed_state_[category] = DismissedState::HIDDEN;
     dismissed_suggestions_[category].clear();
@@ skipping 159 matching lines @@
 
 void SnippetsInternalsMessageHandler::OnDismissedSuggestionsLoaded(
     Category category,
     std::vector<ContentSuggestion> dismissed_suggestions) {
   if (dismissed_state_[category] == DismissedState::HIDDEN)
     return;
   dismissed_suggestions_[category] = std::move(dismissed_suggestions);
   dismissed_state_[category] = DismissedState::VISIBLE;
   SendContentSuggestions();
 }