Attempting to resolve a race condition with PowerMonitor

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ skipping 430 matching lines @@
 
   InitializeMainThread();
 
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SystemMonitor")
     system_monitor_.reset(new base::SystemMonitor);
   }
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:PowerMonitor")
     scoped_ptr<base::PowerMonitorSource> power_monitor_source(
-      new base::PowerMonitorDeviceSource());
-    power_monitor_.reset(new base::PowerMonitor(power_monitor_source.Pass()));
+        new base::PowerMonitorDeviceSource());
+    base::PowerMonitor::Initialize(power_monitor_source.Pass());
   }
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:HighResTimerManager")
     hi_res_timer_manager_.reset(new base::HighResolutionTimerManager);
   }
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:NetworkChangeNotifier")
     network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
   }
 
@@ skipping 433 matching lines @@
   {
     TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:SensorService");
     DeviceInertialSensorService::GetInstance()->Shutdown();
   }
   {
     TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");
     URLDataManager::DeleteDataSources();
   }
 #endif  // !defined(OS_IOS)
 
+  {
+    TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PowerMonitor");
+    base::PowerMonitor::Shutdown();
+  }
+
   if (parts_) {
     TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PostDestroyThreads");
     parts_->PostDestroyThreads();
   }
 }
 
 void BrowserMainLoop::InitializeMainThread() {
   TRACE_EVENT0("startup", "BrowserMainLoop::InitializeMainThread")
   const char* kThreadName = "CrBrowserMain";
   base::PlatformThread::SetName(kThreadName);
@@ skipping 208 matching lines @@
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       trace_file, TracingController::TracingFileResultCallback());
 }
 
 }  // namespace content