| Index: components/sync_driver/local_device_info_provider_mock.h
|
| diff --git a/components/sync_driver/local_device_info_provider_mock.h b/components/sync_driver/local_device_info_provider_mock.h
|
| index 8ae2e60d61382186c4ba8f6e1e22cc19857b2a4b..fcbcb15f8ea43eae9915befb485cc1081eb4860e 100644
|
| --- a/components/sync_driver/local_device_info_provider_mock.h
|
| +++ b/components/sync_driver/local_device_info_provider_mock.h
|
| @@ -34,16 +34,16 @@ class LocalDeviceInfoProviderMock
|
| const std::string& cache_guid,
|
| const std::string& signin_scoped_device_id,
|
| const scoped_refptr<base::TaskRunner>& blocking_task_runner) override;
|
| - scoped_ptr<Subscription> RegisterOnInitializedCallback(
|
| + std::unique_ptr<Subscription> RegisterOnInitializedCallback(
|
| const base::Closure& callback) override;
|
|
|
| - void Initialize(scoped_ptr<DeviceInfo> local_device_info);
|
| + void Initialize(std::unique_ptr<DeviceInfo> local_device_info);
|
| void SetInitialized(bool is_initialized);
|
|
|
| private:
|
| bool is_initialized_;
|
|
|
| - scoped_ptr<DeviceInfo> local_device_info_;
|
| + std::unique_ptr<DeviceInfo> local_device_info_;
|
| base::CallbackList<void(void)> callback_list_;
|
| };
|
|
|
|
|