| Index: components/browser_sync/profile_sync_service.h
|
| diff --git a/components/browser_sync/profile_sync_service.h b/components/browser_sync/profile_sync_service.h
|
| index 77e20fe205e0aed959296b7f0ec4fe0b704541a4..aea88e76a7f8975be38b2266e731022c813cf79d 100644
|
| --- a/components/browser_sync/profile_sync_service.h
|
| +++ b/components/browser_sync/profile_sync_service.h
|
| @@ -72,7 +72,7 @@ namespace syncer {
|
| class BackendMigrator;
|
| class BaseTransaction;
|
| class DataTypeManager;
|
| -class DeviceInfoService;
|
| +class DeviceInfoSyncBridge;
|
| class DeviceInfoSyncService;
|
| class DeviceInfoTracker;
|
| class LocalDeviceInfoProvider;
|
| @@ -346,7 +346,7 @@ class ProfileSyncService : public syncer::SyncService,
|
| virtual syncer::SyncableService* GetDeviceInfoSyncableService();
|
|
|
| // Returns the ModelTypeSyncBridge for syncer::DEVICE_INFO.
|
| - virtual syncer::ModelTypeSyncBridge* GetDeviceInfoService();
|
| + virtual syncer::ModelTypeSyncBridge* GetDeviceInfoSyncBridge();
|
|
|
| // Returns synced devices tracker.
|
| virtual syncer::DeviceInfoTracker* GetDeviceInfoTracker() const;
|
| @@ -961,7 +961,7 @@ class ProfileSyncService : public syncer::SyncService,
|
| // Locally owned SyncableService and ModelTypeSyncBridge implementations.
|
| std::unique_ptr<sync_sessions::SessionsSyncManager> sessions_sync_manager_;
|
| std::unique_ptr<syncer::DeviceInfoSyncService> device_info_sync_service_;
|
| - std::unique_ptr<syncer::DeviceInfoService> device_info_service_;
|
| + std::unique_ptr<syncer::DeviceInfoSyncBridge> device_info_service_;
|
|
|
| std::unique_ptr<syncer::NetworkResources> network_resources_;
|
|
|
|
|