| Index: base/power_monitor/power_monitor.h
|
| diff --git a/base/power_monitor/power_monitor.h b/base/power_monitor/power_monitor.h
|
| index 683eeb9733c131d0ff712fa7f7326d4ff0b994af..e025b324011b4420750bdbf53744bf04ccab62c9 100644
|
| --- a/base/power_monitor/power_monitor.h
|
| +++ b/base/power_monitor/power_monitor.h
|
| @@ -20,7 +20,7 @@ class PowerMonitorSource;
|
| class BASE_EXPORT PowerMonitor {
|
| public:
|
| // Takes ownership of |source|.
|
| - explicit PowerMonitor(scoped_ptr<PowerMonitorSource> source);
|
| + explicit PowerMonitor(std::unique_ptr<PowerMonitorSource> source);
|
| ~PowerMonitor();
|
|
|
| // Get the process-wide PowerMonitor (if not present, returns NULL).
|
| @@ -45,7 +45,7 @@ class BASE_EXPORT PowerMonitor {
|
| void NotifyResume();
|
|
|
| scoped_refptr<ObserverListThreadSafe<PowerObserver> > observers_;
|
| - scoped_ptr<PowerMonitorSource> source_;
|
| + std::unique_ptr<PowerMonitorSource> source_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PowerMonitor);
|
| };
|
|
|