| Index: content/browser/power_usage_monitor_impl.h
|
| diff --git a/content/browser/power_usage_monitor_impl.h b/content/browser/power_usage_monitor_impl.h
|
| index 0e3b4e30274d23554883c160dac5993501d84820..a2c7e96a32f64dc4fa342d6d643ae34472f12219 100644
|
| --- a/content/browser/power_usage_monitor_impl.h
|
| +++ b/content/browser/power_usage_monitor_impl.h
|
| @@ -63,7 +63,7 @@ class CONTENT_EXPORT PowerUsageMonitor : public base::PowerObserver,
|
| // system boot.
|
| void Start();
|
|
|
| - void SetSystemInterfaceForTest(scoped_ptr<SystemInterface> interface);
|
| + void SetSystemInterfaceForTest(std::unique_ptr<SystemInterface> interface);
|
|
|
| // Overridden from base::PowerObserver:
|
| void OnPowerStateChange(bool on_battery_power) override;
|
| @@ -93,12 +93,12 @@ class CONTENT_EXPORT PowerUsageMonitor : public base::PowerObserver,
|
| void CancelPendingHistogramReporting();
|
|
|
| device::BatteryStatusService::BatteryUpdateCallback callback_;
|
| - scoped_ptr<device::BatteryStatusService::BatteryUpdateSubscription>
|
| + std::unique_ptr<device::BatteryStatusService::BatteryUpdateSubscription>
|
| subscription_;
|
|
|
| NotificationRegistrar registrar_;
|
|
|
| - scoped_ptr<SystemInterface> system_interface_;
|
| + std::unique_ptr<SystemInterface> system_interface_;
|
|
|
| // True if monitoring was started (Start() called).
|
| bool started_;
|
|
|