| Index: chrome/browser/sync/profile_sync_service_factory.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
|
| index 957603e0707bf102c6f46a237bb5ec3aadf7eccf..6429113937285514f55105a72cdddf50518cbdcf 100644
|
| --- a/chrome/browser/sync/profile_sync_service_factory.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_factory.cc
|
| @@ -32,7 +32,6 @@
|
| #include "chrome/browser/spellchecker/spellcheck_factory.h"
|
| #include "chrome/browser/sync/chrome_sync_client.h"
|
| #include "chrome/browser/sync/sessions/sync_sessions_web_contents_router_factory.h"
|
| -#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
|
| #include "chrome/browser/sync/user_event_service_factory.h"
|
| #include "chrome/browser/themes/theme_service_factory.h"
|
| #include "chrome/browser/undo/bookmark_undo_service_factory.h"
|
| @@ -61,6 +60,7 @@
|
| #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
|
| #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
|
| #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
|
| +#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
|
| #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
|
|
| #if !defined(OS_ANDROID)
|
| @@ -215,8 +215,6 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
|
| #endif // defined(OS_WIN)
|
|
|
| if (!local_sync_backend_enabled) {
|
| - SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
|
| -
|
| // Always create the GCMProfileService instance such that we can listen to
|
| // the profile notifications and purge the GCM store when the profile is
|
| // being signed out.
|
| @@ -226,8 +224,11 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
|
| // once http://crbug.com/171406 has been fixed.
|
| AboutSigninInternalsFactory::GetForProfile(profile);
|
|
|
| +#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
| + SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
|
| init_params.signin_wrapper =
|
| base::MakeUnique<SupervisedUserSigninManagerWrapper>(profile, signin);
|
| +#endif
|
| init_params.oauth2_token_service =
|
| ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
|
| init_params.gaia_cookie_manager_service =
|
|
|