[NTP::SectionOrder] Propagate new order through ContentSuggestionsService.

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>
@@ skipping 48 matching lines @@
     observer.ContentSuggestionsServiceShutdown();
   }
 }
 
 // static
 void ContentSuggestionsService::RegisterProfilePrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterListPref(prefs::kDismissedCategories);
 }
 
+std::vector<Category> ContentSuggestionsService::GetCategories() const {
+  std::vector<Category> sorted_categories = categories_;
+  std::sort(sorted_categories.begin(), sorted_categories.end(),
+            [this](const Category& left, const Category& right) {
+              return category_ranker_->Compare(left, right);
+            });
+  return sorted_categories;
+}
+
 CategoryStatus ContentSuggestionsService::GetCategoryStatus(
     Category category) const {
   if (state_ == State::DISABLED) {
     return CategoryStatus::ALL_SUGGESTIONS_EXPLICITLY_DISABLED;
   }
 
   auto iterator = providers_by_category_.find(category);
   if (iterator == providers_by_category_.end()) {
     return CategoryStatus::NOT_PROVIDED;
   }
@@ skipping 303 matching lines @@
 }
 
 void ContentSuggestionsService::RegisterCategory(
     Category category,
     ContentSuggestionsProvider* provider) {
   DCHECK(!base::ContainsKey(providers_by_category_, category));
   DCHECK(!IsCategoryDismissed(category));
 
   providers_by_category_[category] = provider;
   categories_.push_back(category);
-  SortCategories();
   if (IsCategoryStatusAvailable(provider->GetCategoryStatus(category))) {
     suggestions_by_category_.insert(
         std::make_pair(category, std::vector<ContentSuggestion>()));
   }
 }
 
 void ContentSuggestionsService::UnregisterCategory(
     Category category,
     ContentSuggestionsProvider* provider) {
   auto providers_it = providers_by_category_.find(category);
@@ skipping 38 matching lines @@
     provider->OnSignInStateChanged();
   }
 
   // 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_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));
 
   // Keep the reference to the provider and remove it from the dismissed ones,
   // because the category registration enforces that it's not dismissed.
@@ skipping 27 matching lines @@
 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