Index: device/battery/battery_status_service.cc |
diff --git a/device/battery/battery_status_service.cc b/device/battery/battery_status_service.cc |
index 6b3c34c0b0e1f7f021fc2f71a41eeaad9002388e..bd3e412bdf5109ef524260dffc4adcccffe034bb 100644 |
--- a/device/battery/battery_status_service.cc |
+++ b/device/battery/battery_status_service.cc |
@@ -34,7 +34,7 @@ BatteryStatusService* BatteryStatusService::GetInstance() { |
base::LeakySingletonTraits<BatteryStatusService>>::get(); |
} |
-scoped_ptr<BatteryStatusService::BatteryUpdateSubscription> |
+std::unique_ptr<BatteryStatusService::BatteryUpdateSubscription> |
BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { |
DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); |
DCHECK(!is_shutdown_); |
@@ -100,7 +100,7 @@ BatteryStatusService::GetUpdateCallbackForTesting() const { |
} |
void BatteryStatusService::SetBatteryManagerForTesting( |
- scoped_ptr<BatteryStatusManager> test_battery_manager) { |
+ std::unique_ptr<BatteryStatusManager> test_battery_manager) { |
battery_fetcher_ = std::move(test_battery_manager); |
status_ = BatteryStatus(); |
status_updated_ = false; |