Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2968)

Unified Diff: device/battery/battery_status_service.cc

Issue 1874313002: Convert device to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/battery/battery_status_service.h ('k') | device/battery/battery_status_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « device/battery/battery_status_service.h ('k') | device/battery/battery_status_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698