[Remote suggestions] Refactor the scheduler

ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc

Index: ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
diff --git a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
index f0edcd579c354aec1e65db7febc00ca7738d7c24..0bead519a17ce4c07c651ea63d5e8026d4132d59 100644
--- a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
+++ b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory.cc
@@ -30,8 +30,8 @@
 #include "components/ntp_snippets/remote/remote_suggestions_database.h"
 #include "components/ntp_snippets/remote/remote_suggestions_fetcher.h"
 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h"
+#include "components/ntp_snippets/remote/remote_suggestions_scheduler_impl.h"
 #include "components/ntp_snippets/remote/remote_suggestions_status_service.h"
-#include "components/ntp_snippets/remote/scheduling_remote_suggestions_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/version_info/version_info.h"
 #include "google_apis/google_api_keys.h"
@@ -58,8 +58,8 @@ using ntp_snippets::PersistentScheduler;
 using ntp_snippets::RemoteSuggestionsDatabase;
 using ntp_snippets::RemoteSuggestionsFetcher;
 using ntp_snippets::RemoteSuggestionsProviderImpl;
+using ntp_snippets::RemoteSuggestionsSchedulerImpl;
 using ntp_snippets::RemoteSuggestionsStatusService;
-using ntp_snippets::SchedulingRemoteSuggestionsProvider;
 using suggestions::CreateIOSImageDecoder;
 
 namespace {
@@ -180,17 +180,16 @@ IOSChromeContentSuggestionsServiceFactory::BuildServiceInstanceFor(
                                                          prefs));
 
     // TODO(jkrcal): Implement a persistent scheduler for iOS. crbug.com/676249
-    RemoteSuggestionsProviderImpl* provider_raw = provider.get();
-    auto scheduling_provider =
-        base::MakeUnique<SchedulingRemoteSuggestionsProvider>(
-            service.get(), std::move(provider),
-            /*persistent_scheduler=*/nullptr, service->user_classifier(), prefs,
-            GetApplicationContext()->GetLocalState(),
-            base::MakeUnique<base::DefaultClock>());
-    provider_raw->SetRemoteSuggestionsScheduler(scheduling_provider.get());
-    service->set_remote_suggestions_provider(scheduling_provider.get());
-    service->set_remote_suggestions_scheduler(scheduling_provider.get());
-    service->RegisterProvider(std::move(scheduling_provider));
+    auto scheduler = base::MakeUnique<RemoteSuggestionsSchedulerImpl>(
+        provider.get(), /*persistent_scheduler=*/nullptr,
+        service->user_classifier(), prefs,
+        GetApplicationContext()->GetLocalState(),
+        base::MakeUnique<base::DefaultClock>());
+    provider->SetRemoteSuggestionsScheduler(scheduler.get());
+    service->set_remote_suggestions_provider(provider.get());
+
+    service->set_remote_suggestions_scheduler(std::move(scheduler));
+    service->RegisterProvider(std::move(provider));
   }
 
   return std::move(service);