| Index: chrome/browser/profiles/profile_manager.cc
|
| diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
|
| index 55b1d61e59aa81952f5b121678dddac6760375dd..c08ef616b911b159935aaf070a84d0cdbbc6e0bf 100644
|
| --- a/chrome/browser/profiles/profile_manager.cc
|
| +++ b/chrome/browser/profiles/profile_manager.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/deferred_sequenced_task_runner.h"
|
| +#include "base/feature_list.h"
|
| #include "base/files/file_enumerator.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| @@ -105,15 +106,17 @@
|
| #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
|
| #endif
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "chrome/browser/android/chrome_feature_list.h"
|
| +#include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
|
| +#include "components/ntp_snippets/ntp_snippets_service.h"
|
| +#endif
|
| +
|
| #if !defined(OS_IOS)
|
| #include "chrome/browser/sessions/session_service_factory.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| #endif // !defined (OS_IOS)
|
|
|
| -#if defined(OS_WIN)
|
| -#include "chrome/installer/util/browser_distribution.h"
|
| -#endif
|
| -
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/browser_process_platform_part_chromeos.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| @@ -124,6 +127,10 @@
|
| #include "components/user_manager/user_manager.h"
|
| #endif
|
|
|
| +#if defined(OS_WIN)
|
| +#include "chrome/installer/util/browser_distribution.h"
|
| +#endif
|
| +
|
| using base::UserMetricsAction;
|
| using content::BrowserThread;
|
|
|
| @@ -1154,6 +1161,14 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
|
| // migration code, rough time estimates are Q1 2016.
|
| PasswordManagerSettingMigratorServiceFactory::GetForProfile(profile)
|
| ->InitializeMigration(ProfileSyncServiceFactory::GetForProfile(profile));
|
| +
|
| +#if defined(OS_ANDROID)
|
| + // Service is responsible for fetching content snippets for the NTP.
|
| + // Note: Create the service even if the feature is disabled, so that any
|
| + // remaining tasks will be cleaned up.
|
| + NTPSnippetsServiceFactory::GetForProfile(profile)->Init(
|
| + base::FeatureList::IsEnabled(chrome::android::kNTPSnippetsFeature));
|
| +#endif
|
| }
|
|
|
| void ProfileManager::DoFinalInitLogging(Profile* profile) {
|
|
|