| Index: chrome/browser/supervised_user/supervised_user_service.h
|
| diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
|
| index 0c37600e9b70cabd3bfb187688ab970a1449bbc9..248776714b590a6ed606c4a838b0cc6dbfb1bcb6 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_service.h
|
| @@ -61,7 +61,7 @@ namespace extensions {
|
| class ExtensionRegistry;
|
| }
|
|
|
| -namespace sync_driver {
|
| +namespace syncer {
|
| class SyncSetupInProgressHandle;
|
| }
|
|
|
| @@ -77,9 +77,9 @@ class SupervisedUserService : public KeyedService,
|
| public extensions::ExtensionRegistryObserver,
|
| public extensions::ManagementPolicy::Provider,
|
| #endif
|
| - public SyncTypePreferenceProvider,
|
| + public syncer::SyncTypePreferenceProvider,
|
| #if !defined(OS_ANDROID)
|
| - public sync_driver::SyncServiceObserver,
|
| + public syncer::SyncServiceObserver,
|
| public chrome::BrowserListObserver,
|
| #endif
|
| public SupervisedUserURLFilter::Observer {
|
| @@ -213,7 +213,7 @@ class SupervisedUserService : public KeyedService,
|
| syncer::ModelTypeSet GetPreferredDataTypes() const override;
|
|
|
| #if !defined(OS_ANDROID)
|
| - // sync_driver::SyncServiceObserver implementation:
|
| + // syncer::SyncServiceObserver implementation:
|
| void OnStateChanged() override;
|
|
|
| // chrome::BrowserListObserver implementation:
|
| @@ -471,7 +471,7 @@ class SupervisedUserService : public KeyedService,
|
| base::ObserverList<SupervisedUserServiceObserver> observer_list_;
|
|
|
| // Prevents Sync from running until configuration is complete.
|
| - std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
|
| + std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
|
|
|
| base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
|
| };
|
|
|