| Index: content/child/child_thread.cc
|
| diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
|
| index d5fc4b4703895f653973b696bf04acfb38390d07..95162f2d4ce80b16ef79cdb55e6451ece93513d9 100644
|
| --- a/content/child/child_thread.cc
|
| +++ b/content/child/child_thread.cc
|
| @@ -216,13 +216,13 @@ void ChildThread::Init() {
|
| channel_->AddFilter(service_worker_message_filter_->GetFilter());
|
|
|
| // In single process mode we may already have a power monitor
|
| - if (!base::PowerMonitor::Get()) {
|
| + if (!base::PowerMonitor::IsInitialized()) {
|
| scoped_ptr<PowerMonitorBroadcastSource> power_monitor_source(
|
| - new PowerMonitorBroadcastSource());
|
| + new PowerMonitorBroadcastSource());
|
| channel_->AddFilter(power_monitor_source->GetMessageFilter());
|
|
|
| - power_monitor_.reset(new base::PowerMonitor(
|
| - power_monitor_source.PassAs<base::PowerMonitorSource>()));
|
| + base::PowerMonitor::Initialize(
|
| + power_monitor_source.PassAs<base::PowerMonitorSource>());
|
| }
|
|
|
| #if defined(OS_POSIX)
|
|
|