Move OnURLsDeleted from NTPSnippetsService to ContentSuggestionsService

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 "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
@@ skipping 108 matching lines @@
   std::unique_ptr<PhysicalWebPageSuggestionsProvider>
       physical_web_page_suggestions_provider =
           base::MakeUnique<PhysicalWebPageSuggestionsProvider>(
               service, category_factory);
   service->RegisterProvider(std::move(physical_web_page_suggestions_provider));
 }
 #endif  // OS_ANDROID
 
 void RegisterArticleProvider(SigninManagerBase* signin_manager,
                              OAuth2TokenService* token_service,
-                             HistoryService* history_service,
                              SuggestionsService* suggestions_service,
                              ContentSuggestionsService* service,
                              CategoryFactory* category_factory,
                              PrefService* pref_service,
                              Profile* profile) {
   scoped_refptr<net::URLRequestContextGetter> request_context =
       content::BrowserContext::GetDefaultStoragePartition(profile)
           ->GetURLRequestContext();
 
   NTPSnippetsScheduler* scheduler = nullptr;
 #if defined(OS_ANDROID)
   scheduler = NTPSnippetsLauncher::Get();
 #endif  // OS_ANDROID
   base::FilePath database_dir(
       profile->GetPath().Append(ntp_snippets::kDatabaseFolder));
   scoped_refptr<base::SequencedTaskRunner> task_runner =
       BrowserThread::GetBlockingPool()
           ->GetSequencedTaskRunnerWithShutdownBehavior(
               base::SequencedWorkerPool::GetSequenceToken(),
               base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
   bool is_stable_channel =
       chrome::GetChannel() == version_info::Channel::STABLE;
   std::unique_ptr<NTPSnippetsService> ntp_snippets_service =
       base::MakeUnique<NTPSnippetsService>(
-          service, service->category_factory(), pref_service, history_service,
+          service, service->category_factory(), pref_service,
           suggestions_service, g_browser_process->GetApplicationLocale(),
           scheduler,
           base::MakeUnique<NTPSnippetsFetcher>(
               signin_manager, token_service, request_context, pref_service,
               category_factory, base::Bind(&safe_json::SafeJsonParser::Parse),
               is_stable_channel),
           base::MakeUnique<ImageFetcherImpl>(
               base::MakeUnique<ImageDecoderImpl>(), request_context.get()),
           base::MakeUnique<ImageDecoderImpl>(),
           base::MakeUnique<NTPSnippetsDatabase>(database_dir, task_runner),
@@ skipping 38 matching lines @@
     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;
-  ContentSuggestionsService* service = new ContentSuggestionsService(state);
+  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
+      profile, ServiceAccessType::EXPLICIT_ACCESS);
+  ContentSuggestionsService* service =
+      new ContentSuggestionsService(state, history_service);
   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;
   }
 
   CategoryFactory* category_factory = service->category_factory();
   PrefService* pref_service = profile->GetPrefs();
 #if defined(OS_ANDROID)
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(profile);
 #endif  // OS_ANDROID
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForBrowserContext(profile);
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   OAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
-  HistoryService* history_service = HistoryServiceFactory::GetForProfile(
-      profile, ServiceAccessType::EXPLICIT_ACCESS);
   SuggestionsService* suggestions_service =
       SuggestionsServiceFactory::GetForProfile(profile);
 
 #if defined(OS_ANDROID)
   bool recent_tabs_enabled = base::FeatureList::IsEnabled(
       ntp_snippets::kRecentOfflineTabSuggestionsFeature);
   bool downloads_enabled =
       base::FeatureList::IsEnabled(ntp_snippets::kDownloadSuggestionsFeature);
   if (recent_tabs_enabled || downloads_enabled) {
     RegisterOfflinePageProvider(offline_page_model, service, category_factory,
                                 pref_service);
   }
 #endif  // OS_ANDROID
 
   // |bookmark_model| can be null in tests.
   if (base::FeatureList::IsEnabled(ntp_snippets::kBookmarkSuggestionsFeature) &&
       bookmark_model) {
     RegisterBookmarkProvider(bookmark_model, service, category_factory,
                              pref_service);
   }
 
 #if defined(OS_ANDROID)
   if (base::FeatureList::IsEnabled(
           ntp_snippets::kPhysicalWebPageSuggestionsFeature)) {
     RegisterPhysicalWebPageProvider(service, category_factory);
   }
 #endif  // OS_ANDROID
 
   if (base::FeatureList::IsEnabled(ntp_snippets::kArticleSuggestionsFeature)) {
-    RegisterArticleProvider(signin_manager, token_service, history_service,
-                            suggestions_service, service, category_factory,
-                            pref_service, profile);
+    RegisterArticleProvider(signin_manager, token_service, suggestions_service,
+                            service, category_factory, pref_service, profile);
   }
 
   return service;
 }