| Index: sync/internal_api/public/test/fake_sync_manager.h
|
| diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h
|
| index 9bdde3f4e8f12bceeb9994cafdda6e2fa6451841..b0444792d0f657aa423992ffc1a66f565a5e6e53 100644
|
| --- a/sync/internal_api/public/test/fake_sync_manager.h
|
| +++ b/sync/internal_api/public/test/fake_sync_manager.h
|
| @@ -91,7 +91,7 @@ class FakeSyncManager : public SyncManager {
|
| const base::Closure& retry_task) override;
|
| void OnIncomingInvalidation(
|
| syncer::ModelType type,
|
| - scoped_ptr<InvalidationInterface> interface) override;
|
| + std::unique_ptr<InvalidationInterface> interface) override;
|
| void SetInvalidatorEnabled(bool invalidator_enabled) override;
|
| void AddObserver(Observer* observer) override;
|
| void RemoveObserver(Observer* observer) override;
|
| @@ -105,7 +105,7 @@ class FakeSyncManager : public SyncManager {
|
| 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 RefreshTypes(ModelTypeSet types) override;
|
| void RegisterDirectoryTypeDebugInfoObserver(
|
| @@ -144,7 +144,7 @@ class FakeSyncManager : public SyncManager {
|
| // The most recent configure reason.
|
| ConfigureReason last_configure_reason_;
|
|
|
| - scoped_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
|
| + std::unique_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_;
|
|
|
| TestUserShare test_user_share_;
|
|
|
|
|