[NTP::Cleanup] Avoid nested complex function calls

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 5df921a2197792f5777aed78dc80da4643e89c40..c5fc2a8660a39d7805bc76c0c8a3b961508a77a3 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
@@ -123,9 +123,9 @@ IOSChromeContentSuggestionsServiceFactory::BuildServiceInstanceFor(
   HistoryService* history_service =
       ios::HistoryServiceFactory::GetForBrowserState(
           chrome_browser_state, ServiceAccessType::EXPLICIT_ACCESS);
+  auto ranker_clock = base::MakeUnique<base::DefaultClock>();
   std::unique_ptr<ntp_snippets::CategoryRanker> category_ranker =
-      ntp_snippets::BuildSelectedCategoryRanker(
-          prefs, base::MakeUnique<base::DefaultClock>());
+      ntp_snippets::BuildSelectedCategoryRanker(prefs, std::move(ranker_clock));
   std::unique_ptr<ContentSuggestionsService> service =
       base::MakeUnique<ContentSuggestionsService>(
           State::ENABLED, signin_manager, history_service, prefs,
@@ -154,29 +154,31 @@ IOSChromeContentSuggestionsServiceFactory::BuildServiceInstanceFor(
             ->GetSequencedTaskRunnerWithShutdownBehavior(
                 base::SequencedWorkerPool::GetSequenceToken(),
                 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
+    auto suggestions_fetcher = base::MakeUnique<RemoteSuggestionsFetcher>(
+        signin_manager, token_service, request_context, prefs, nullptr,
+        base::Bind(&ParseJson), GetChannel() == version_info::Channel::STABLE
+                                    ? google_apis::GetAPIKey()
+                                    : google_apis::GetNonStableAPIKey(),
+        service->user_classifier());
+    auto image_fetcher = base::MakeUnique<ImageFetcherImpl>(
+        request_context.get(), web::WebThread::GetBlockingPool());
+    auto database =
+        base::MakeUnique<RemoteSuggestionsDatabase>(database_dir, task_runner);
+    auto status_service =
+        base::MakeUnique<RemoteSuggestionsStatusService>(signin_manager, prefs);
     auto provider = base::MakeUnique<RemoteSuggestionsProviderImpl>(
         service.get(), prefs, GetApplicationContext()->GetApplicationLocale(),
-        service->category_ranker(),
-        base::MakeUnique<RemoteSuggestionsFetcher>(
-            signin_manager, token_service, request_context, prefs, nullptr,
-            base::Bind(&ParseJson),
-            GetChannel() == version_info::Channel::STABLE
-                ? google_apis::GetAPIKey()
-                : google_apis::GetNonStableAPIKey(),
-            service->user_classifier()),
-        base::MakeUnique<ImageFetcherImpl>(request_context.get(),
-                                           web::WebThread::GetBlockingPool()),
-        CreateIOSImageDecoder(task_runner),
-        base::MakeUnique<RemoteSuggestionsDatabase>(database_dir, task_runner),
-        base::MakeUnique<RemoteSuggestionsStatusService>(signin_manager,
-                                                         prefs));
+        service->category_ranker(), std::move(suggestions_fetcher),
+        std::move(image_fetcher), CreateIOSImageDecoder(task_runner),
+        std::move(database), std::move(status_service));
 
     // TODO(jkrcal): Implement a persistent scheduler for iOS. crbug.com/676249
+    auto scheduling_provider_clock = base::MakeUnique<base::DefaultClock>();
     auto scheduling_provider =
         base::MakeUnique<SchedulingRemoteSuggestionsProvider>(
             service.get(), std::move(provider),
             /*persistent_scheduler=*/nullptr, service->user_classifier(), prefs,
-            base::MakeUnique<base::DefaultClock>());
+            std::move(scheduling_provider_clock));
     service->set_remote_suggestions_provider(scheduling_provider.get());
     service->set_remote_suggestions_scheduler(scheduling_provider.get());
     service->RegisterProvider(std::move(scheduling_provider));