[Remote suggestions] Refactor the scheduler

components/ntp_snippets/content_suggestions_service_unittest.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 <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/time/default_clock.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/category_rankers/constant_category_ranker.h"
 #include "components/ntp_snippets/category_rankers/fake_category_ranker.h"
 #include "components/ntp_snippets/category_rankers/mock_category_ranker.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
 #include "components/ntp_snippets/mock_content_suggestions_provider.h"
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/prefs/testing_pref_service.h"
@@ skipping 112 matching lines @@
 
  protected:
   void RegisterPrefs() {
     ContentSuggestionsService::RegisterProfilePrefs(pref_service_->registry());
     UserClassifier::RegisterProfilePrefs(pref_service_->registry());
   }
 
   void CreateContentSuggestionsService(
       ContentSuggestionsService::State enabled) {
     ASSERT_FALSE(service_);
+
+    // TODO(jkrcal): Replace by a mock.
+    auto user_classifier = base::MakeUnique<UserClassifier>(
+        pref_service_.get(), base::MakeUnique<base::DefaultClock>());

[Marc Treib, 2017/03/27 14:27:20]

Can we keep this, and remove the "can be null in tests"?

[jkrcal, 2017/03/29 10:55:57]

Done.

+
     service_ = base::MakeUnique<ContentSuggestionsService>(
         enabled, /*signin_manager=*/nullptr, /*history_service=*/nullptr,
-        pref_service_.get(), std::move(category_ranker_));
+        pref_service_.get(), std::move(category_ranker_),
+        std::move(user_classifier), /*scheduler=*/nullptr);
   }
 
   void ResetService() {
     service_->Shutdown();
     service_.reset();
     CreateContentSuggestionsService(ContentSuggestionsService::State::ENABLED);
   }
 
   ContentSuggestionsService* service() { return service_.get(); }
 
@@ skipping 638 matching lines @@
   Category category = Category::FromKnownCategory(KnownCategories::BOOKMARKS);
   MockContentSuggestionsProvider* provider =
       MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
 
   EXPECT_CALL(*raw_mock_ranker, OnCategoryDismissed(category));
   service()->DismissCategory(category);
 }
 
 }  // namespace ntp_snippets