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

components/ntp_snippets/content_suggestions_service.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/content_suggestions_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "ui/gfx/image/image.h"
 
 namespace ntp_snippets {
 
 ContentSuggestionsService::ContentSuggestionsService(
     State state,
     SigninManagerBase* signin_manager,
     history::HistoryService* history_service,
-    PrefService* pref_service)
+    PrefService* pref_service,
+    std::unique_ptr<CategoryRanker> category_ranker)
     : state_(state),
       signin_observer_(this),
       history_service_observer_(this),
       ntp_snippets_service_(nullptr),
       pref_service_(pref_service),
-      user_classifier_(pref_service) {
+      user_classifier_(pref_service),
+      category_ranker_(std::move(category_ranker)) {
   // Can be null in tests.
   if (signin_manager) {
     signin_observer_.Add(signin_manager);
   }
 
   if (history_service) {
     history_service_observer_.Add(history_service);
   }
 
   RestoreDismissedCategoriesFromPrefs();
@@ skipping 397 matching lines @@
   // Finally notify the observers so they refresh only after the backend is
   // ready.
   for (Observer& observer : observers_) {
     observer.OnFullRefreshRequired();
   }
 }
 
 void ContentSuggestionsService::SortCategories() {
   std::sort(categories_.begin(), categories_.end(),
             [this](const Category& left, const Category& right) {
-              return category_factory_.CompareCategories(left, right);
+              return category_ranker_->Compare(left, right);
             });
 }
 
 bool ContentSuggestionsService::IsCategoryDismissed(Category category) const {
   return base::ContainsKey(dismissed_providers_by_category_, category);
 }
 
 void ContentSuggestionsService::RestoreDismissedCategory(Category category) {
   auto dismissed_it = dismissed_providers_by_category_.find(category);
   DCHECK(base::ContainsKey(dismissed_providers_by_category_, category));
@@ skipping 16 matching lines @@
   const base::ListValue* list =
       pref_service_->GetList(prefs::kDismissedCategories);
   for (const std::unique_ptr<base::Value>& entry : *list) {
     int id = 0;
     if (!entry->GetAsInteger(&id)) {
       DLOG(WARNING) << "Invalid category pref value: " << *entry;
       continue;
     }
 
     // When the provider is registered, it will be stored in this map.
-    dismissed_providers_by_category_[category_factory()->FromIDValue(id)] =
-        nullptr;
+    dismissed_providers_by_category_[Category::FromIDValue(id)] = nullptr;
   }
 }
 
 void ContentSuggestionsService::StoreDismissedCategoriesToPrefs() {
   base::ListValue list;
   for (const auto& category_provider_pair : dismissed_providers_by_category_) {
     list.AppendInteger(category_provider_pair.first.id());
   }
 
   pref_service_->Set(prefs::kDismissedCategories, list);
 }
 
 }  // namespace ntp_snippets