| Index: sync/internal_api/sync_manager_impl.h
|
| diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
|
| index 2c51a481c24c6e4730db1dbd4ec52d3e71fb6d89..5a6da032b45f17bf207082b8b08e174c5236b02c 100644
|
| --- a/sync/internal_api/sync_manager_impl.h
|
| +++ b/sync/internal_api/sync_manager_impl.h
|
| @@ -95,7 +95,7 @@ class SYNC_EXPORT SyncManagerImpl
|
| void SetInvalidatorEnabled(bool invalidator_enabled) override;
|
| void OnIncomingInvalidation(
|
| syncer::ModelType type,
|
| - scoped_ptr<InvalidationInterface> invalidation) override;
|
| + std::unique_ptr<InvalidationInterface> invalidation) override;
|
| void AddObserver(SyncManager::Observer* observer) override;
|
| void RemoveObserver(SyncManager::Observer* observer) override;
|
| SyncStatus GetDetailedStatus() const override;
|
| @@ -108,7 +108,7 @@ class SYNC_EXPORT SyncManagerImpl
|
| bool HasUnsyncedItems() override;
|
| SyncEncryptionHandler* GetEncryptionHandler() override;
|
| ScopedVector<syncer::ProtocolEvent> GetBufferedProtocolEvents() override;
|
| - scoped_ptr<base::ListValue> GetAllNodesForType(
|
| + std::unique_ptr<base::ListValue> GetAllNodesForType(
|
| syncer::ModelType type) override;
|
| void RegisterDirectoryTypeDebugInfoObserver(
|
| syncer::TypeDebugInfoObserver* observer) override;
|
| @@ -289,22 +289,22 @@ class SYNC_EXPORT SyncManagerImpl
|
|
|
| // The ServerConnectionManager used to abstract communication between the
|
| // client (the Syncer) and the sync server.
|
| - scoped_ptr<SyncAPIServerConnectionManager> connection_manager_;
|
| + std::unique_ptr<SyncAPIServerConnectionManager> connection_manager_;
|
|
|
| // Maintains state that affects the way we interact with different sync types.
|
| // This state changes when entering or exiting a configuration cycle.
|
| - scoped_ptr<ModelTypeRegistry> model_type_registry_;
|
| + std::unique_ptr<ModelTypeRegistry> model_type_registry_;
|
|
|
| // Thread-safe wrapper for main interface for non-blocking sync types.
|
| - scoped_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_;
|
| + std::unique_ptr<syncer_v2::SyncContextProxy> sync_context_proxy_;
|
|
|
| // A container of various bits of information used by the SyncScheduler to
|
| // create SyncSessions. Must outlive the SyncScheduler.
|
| - scoped_ptr<sessions::SyncSessionContext> session_context_;
|
| + std::unique_ptr<sessions::SyncSessionContext> session_context_;
|
|
|
| // The scheduler that runs the Syncer. Needs to be explicitly
|
| // Start()ed.
|
| - scoped_ptr<SyncScheduler> scheduler_;
|
| + std::unique_ptr<SyncScheduler> scheduler_;
|
|
|
| // A multi-purpose status watch object that aggregates stats from various
|
| // sync components.
|
| @@ -345,7 +345,7 @@ class SYNC_EXPORT SyncManagerImpl
|
| // Sync's encryption handler. It tracks the set of encrypted types, manages
|
| // changing passphrases, and in general handles sync-specific interactions
|
| // with the cryptographer.
|
| - scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_;
|
| + std::unique_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_;
|
|
|
| base::WeakPtrFactory<SyncManagerImpl> weak_ptr_factory_;
|
|
|
|
|