[NTP] Remove the ScrollView version of the NTP.

chrome/browser/ntp_snippets/content_suggestions_service_factory.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 "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 
 #include <utility>
 
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
@@ skipping 79 matching lines @@
 using ntp_snippets::RemoteSuggestionsProviderImpl;
 using ntp_snippets::RemoteSuggestionsStatusService;
 using ntp_snippets::SchedulingRemoteSuggestionsProvider;
 using ntp_snippets::TabDelegateSyncAdapter;
 using suggestions::ImageDecoderImpl;
 using syncer::SyncService;
 using translate::LanguageModel;
 
 namespace {
 
-// Clear the tasks that can be scheduled by running services.
-void ClearScheduledTasks() {
-#if defined(OS_ANDROID)
-  NTPSnippetsLauncher::Get()->Unschedule();
-#endif  // OS_ANDROID
-}
-
 #if defined(OS_ANDROID)
 
 bool IsRecentTabProviderEnabled() {
   return base::FeatureList::IsEnabled(
              ntp_snippets::kRecentOfflineTabSuggestionsFeature) &&
          base::FeatureList::IsEnabled(
              offline_pages::kOffliningRecentPagesFeature);
 }
 
 void RegisterRecentTabProvider(OfflinePageModel* offline_page_model,
@@ skipping 141 matching lines @@
 
 ContentSuggestionsServiceFactory::~ContentSuggestionsServiceFactory() = default;
 
 KeyedService* ContentSuggestionsServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   using State = ContentSuggestionsService::State;
   Profile* profile = Profile::FromBrowserContext(context);
   DCHECK(!profile->IsOffTheRecord());
 
   // Create the ContentSuggestionsService.
-  State state =
-      base::FeatureList::IsEnabled(ntp_snippets::kContentSuggestionsFeature)
-          ? State::ENABLED
-          : State::DISABLED;
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
       profile, ServiceAccessType::EXPLICIT_ACCESS);
   PrefService* pref_service = profile->GetPrefs();
   std::unique_ptr<CategoryRanker> category_ranker =
       ntp_snippets::BuildSelectedCategoryRanker(
           pref_service, base::MakeUnique<base::DefaultClock>());
   auto* service =
-      new ContentSuggestionsService(state, signin_manager, history_service,
-                                    pref_service, std::move(category_ranker));
-  if (state == State::DISABLED) {
-    // Since we won't initialise the services, they won't get a chance to
-    // unschedule their tasks. We do it explicitly here instead.
-    ClearScheduledTasks();
-    return service;
-  }
+      new ContentSuggestionsService(State::ENABLED, signin_manager,
+          history_service, pref_service, std::move(category_ranker));
 
 #if defined(OS_ANDROID)
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(profile);
   DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(profile);
   DownloadService* download_service =
       DownloadServiceFactory::GetForBrowserContext(profile);
   DownloadHistory* download_history = download_service->GetDownloadHistory();
   PhysicalWebDataSource* physical_web_data_source =
@@ skipping 43 matching lines @@
                             language_model, pref_service, profile);
   }
 
   if (base::FeatureList::IsEnabled(
           ntp_snippets::kForeignSessionsSuggestionsFeature)) {
     RegisterForeignSessionsProvider(sync_service, service, pref_service);
   }
 
   return service;
 }