| Index: components/sync_driver/local_device_info_provider_impl.h
|
| diff --git a/components/sync_driver/local_device_info_provider_impl.h b/components/sync_driver/local_device_info_provider_impl.h
|
| index 306f81fa55c4bd3febcfc0de7892dbe109dea147..29dc715228add1d0c8db55c0d91854365ebb523c 100644
|
| --- a/components/sync_driver/local_device_info_provider_impl.h
|
| +++ b/components/sync_driver/local_device_info_provider_impl.h
|
| @@ -29,7 +29,7 @@ class LocalDeviceInfoProviderImpl
|
| 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;
|
|
|
| private:
|
| @@ -48,7 +48,7 @@ class LocalDeviceInfoProviderImpl
|
| const bool is_tablet_;
|
|
|
| std::string cache_guid_;
|
| - scoped_ptr<sync_driver::DeviceInfo> local_device_info_;
|
| + std::unique_ptr<sync_driver::DeviceInfo> local_device_info_;
|
| base::CallbackList<void(void)> callback_list_;
|
| base::WeakPtrFactory<LocalDeviceInfoProviderImpl> weak_factory_;
|
|
|
|
|