| Index: ios/chrome/browser/sync/ios_chrome_sync_client.h
|
| diff --git a/ios/chrome/browser/sync/ios_chrome_sync_client.h b/ios/chrome/browser/sync/ios_chrome_sync_client.h
|
| index 1bff32847f5e1a6411b2fe399ea51163cb1496ff..b378f90dc863665314125d367c2209559f9fc18e 100644
|
| --- a/ios/chrome/browser/sync/ios_chrome_sync_client.h
|
| +++ b/ios/chrome/browser/sync/ios_chrome_sync_client.h
|
| @@ -24,26 +24,26 @@ namespace password_manager {
|
| class PasswordStore;
|
| }
|
|
|
| -namespace sync_driver {
|
| +namespace syncer {
|
| class DeviceInfoTracker;
|
| class SyncApiComponentFactory;
|
| class SyncService;
|
| }
|
|
|
| -class IOSChromeSyncClient : public sync_driver::SyncClient {
|
| +class IOSChromeSyncClient : public syncer::SyncClient {
|
| public:
|
| explicit IOSChromeSyncClient(ios::ChromeBrowserState* browser_state);
|
| ~IOSChromeSyncClient() override;
|
|
|
| // SyncClient implementation.
|
| void Initialize() override;
|
| - sync_driver::SyncService* GetSyncService() override;
|
| + syncer::SyncService* GetSyncService() override;
|
| PrefService* GetPrefService() override;
|
| bookmarks::BookmarkModel* GetBookmarkModel() override;
|
| favicon::FaviconService* GetFaviconService() override;
|
| history::HistoryService* GetHistoryService() override;
|
| base::Closure GetPasswordStateChangedCallback() override;
|
| - sync_driver::SyncApiComponentFactory::RegisterDataTypesMethod
|
| + syncer::SyncApiComponentFactory::RegisterDataTypesMethod
|
| GetRegisterPlatformTypesCallback() override;
|
| autofill::PersonalDataManager* GetPersonalDataManager() override;
|
| invalidation::InvalidationService* GetInvalidationService() override;
|
| @@ -52,25 +52,25 @@ class IOSChromeSyncClient : public sync_driver::SyncClient {
|
| sync_sessions::SyncSessionsClient* GetSyncSessionsClient() override;
|
| base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
|
| syncer::ModelType type) override;
|
| - base::WeakPtr<syncer_v2::ModelTypeService> GetModelTypeServiceForType(
|
| + base::WeakPtr<syncer::ModelTypeService> GetModelTypeServiceForType(
|
| syncer::ModelType type) override;
|
| scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup(
|
| syncer::ModelSafeGroup group,
|
| syncer::WorkerLoopDestructionObserver* observer) override;
|
| - sync_driver::SyncApiComponentFactory* GetSyncApiComponentFactory() override;
|
| + syncer::SyncApiComponentFactory* GetSyncApiComponentFactory() override;
|
|
|
| void SetSyncApiComponentFactoryForTesting(
|
| - std::unique_ptr<sync_driver::SyncApiComponentFactory> component_factory);
|
| + std::unique_ptr<syncer::SyncApiComponentFactory> component_factory);
|
|
|
| // Iterates over browser states and returns any trackers that can be found.
|
| static void GetDeviceInfoTrackers(
|
| - std::vector<const sync_driver::DeviceInfoTracker*>* trackers);
|
| + std::vector<const syncer::DeviceInfoTracker*>* trackers);
|
|
|
| private:
|
| ios::ChromeBrowserState* const browser_state_;
|
|
|
| // The sync api component factory in use by this client.
|
| - std::unique_ptr<sync_driver::SyncApiComponentFactory> component_factory_;
|
| + std::unique_ptr<syncer::SyncApiComponentFactory> component_factory_;
|
|
|
| // Members that must be fetched on the UI thread but accessed on their
|
| // respective backend threads.
|
|
|