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

components/ntp_snippets/content_suggestions_service.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/observer_list.h"
 #include "base/optional.h"
 #include "base/scoped_observer.h"
 #include "base/time/time.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/ntp_snippets/callbacks.h"
-#include "components/ntp_snippets/category_factory.h"
+#include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
+#include "components/ntp_snippets/section_rankers/section_ranker.h"
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/signin/core/browser/signin_manager.h"
 
 class PrefService;
 class PrefRegistrySimple;
 
 namespace ntp_snippets {
 
 class RemoteSuggestionsProvider;
 
@@ skipping 45 matching lines @@
   };
 
   enum State {
     ENABLED,
     DISABLED,
   };
 
   ContentSuggestionsService(State state,
                             SigninManagerBase* signin_manager,
                             history::HistoryService* history_service,
-                            PrefService* pref_service);
+                            PrefService* pref_service,
+                            std::unique_ptr<SectionRanker> section_ranker);
   ~ContentSuggestionsService() override;
 
   // Inherited from KeyedService.
   void Shutdown() override;
 
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   State state() { return state_; }
 
   // Gets all categories for which a provider is registered. The categories
@@ skipping 82 matching lines @@
       Category category,
       const DismissedSuggestionsCallback& callback);
 
   // Only for debugging use through the internals page. Some providers
   // internally store a list of dismissed suggestions to prevent them from
   // reappearing. This function clears all suggestions of the given |category|
   // from such lists, making dismissed suggestions reappear (if the provider
   // supports it).
   void ClearDismissedSuggestionsForDebugging(Category category);
 
-  CategoryFactory* category_factory() { return &category_factory_; }
-
   // The reference to the RemoteSuggestionsProvider provider should only be set
   // by the factory and only be used for scheduling, periodic fetching and
   // debugging.
   RemoteSuggestionsProvider* ntp_snippets_service() {
     return ntp_snippets_service_;
   }
   void set_ntp_snippets_service(
       RemoteSuggestionsProvider* ntp_snippets_service) {
     ntp_snippets_service_ = ntp_snippets_service;
   }
 
   UserClassifier* user_classifier() { return &user_classifier_; }
+  SectionRanker* section_ranker() { return section_ranker_.get(); }
 
  private:
   friend class ContentSuggestionsServiceTest;
 
   // Implementation of ContentSuggestionsProvider::Observer.
   void OnNewSuggestions(ContentSuggestionsProvider* provider,
                         Category category,
                         std::vector<ContentSuggestion> suggestions) override;
   void OnCategoryStatusChanged(ContentSuggestionsProvider* provider,
                                Category category,
@@ skipping 41 matching lines @@
 
   // Re-enables a dismissed category, making querying its provider possible.
   void RestoreDismissedCategory(Category category);
 
   void RestoreDismissedCategoriesFromPrefs();
   void StoreDismissedCategoriesToPrefs();
 
   // Whether the content suggestions feature is enabled.
   State state_;
 
-  // Provides new and existing categories and an order for them.
-  CategoryFactory category_factory_;
-
   // All registered providers, owned by the service.
   std::vector<std::unique_ptr<ContentSuggestionsProvider>> providers_;
 
   // All registered categories and their providers. A provider may be contained
   // multiple times, if it provides multiple categories. The keys of this map
   // are exactly the entries of |categories_| and the values are a subset of
   // |providers_|.
   std::map<Category, ContentSuggestionsProvider*, Category::CompareByID>
       providers_by_category_;
 
@@ skipping 33 matching lines @@
   // Keep a direct reference to this special provider to redirect scheduling,
   // background fetching and debugging calls to it. If the
   // RemoteSuggestionsProvider is loaded, it is also present in |providers_|,
   // otherwise this is a nullptr.
   RemoteSuggestionsProvider* ntp_snippets_service_;
 
   PrefService* pref_service_;
 
   UserClassifier user_classifier_;
 
+  // Probider order for categories.

[Marc Treib, 2016/12/13 12:22:42]

s/Probider/Provides/ ?

[vitaliii, 2016/12/14 08:59:38]

Done.

+  std::unique_ptr<SectionRanker> section_ranker_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentSuggestionsService);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_CONTENT_SUGGESTIONS_SERVICE_H_