| Index: device/battery/battery_monitor_impl.h
|
| diff --git a/device/battery/battery_monitor_impl.h b/device/battery/battery_monitor_impl.h
|
| index 09e1bd48b66c19e7733583ee5a5bfcc93c470b0f..c6ab0455a9da03603b0af925b5f223ed101b5b61 100644
|
| --- a/device/battery/battery_monitor_impl.h
|
| +++ b/device/battery/battery_monitor_impl.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
|
| #define DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "device/battery/battery_export.h"
|
| #include "device/battery/battery_monitor.mojom.h"
|
| #include "device/battery/battery_status_service.h"
|
| @@ -33,7 +34,8 @@ class BatteryMonitorImpl : public BatteryMonitor {
|
| void ReportStatus();
|
|
|
| mojo::StrongBinding<BatteryMonitor> binding_;
|
| - scoped_ptr<BatteryStatusService::BatteryUpdateSubscription> subscription_;
|
| + std::unique_ptr<BatteryStatusService::BatteryUpdateSubscription>
|
| + subscription_;
|
| BatteryStatusCallback callback_;
|
| BatteryStatus status_;
|
| bool status_to_report_;
|
|
|