[Remote suggestions] Refactor the scheduler

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 10 matching lines @@
 #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,
-    std::unique_ptr<CategoryRanker> category_ranker)
+    std::unique_ptr<CategoryRanker> category_ranker,
+    std::unique_ptr<UserClassifier> user_classifier,
+    std::unique_ptr<RemoteSuggestionsScheduler> remote_suggestions_scheduler)
     : state_(state),
       signin_observer_(this),
       history_service_observer_(this),
       remote_suggestions_provider_(nullptr),
-      remote_suggestions_scheduler_(nullptr),
       pref_service_(pref_service),
-      user_classifier_(pref_service, base::MakeUnique<base::DefaultClock>()),
+      remote_suggestions_scheduler_(std::move(remote_suggestions_scheduler)),
+      user_classifier_(std::move(user_classifier)),
       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);
   }
 
@@ skipping 461 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