Attempting to resolve a race condition with PowerMonitor

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index d569188984f2990471f5a3e1833af4474798da6b..343c33f7ba08b0e018cea6a68cacd880ec22213e 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -448,8 +448,8 @@ void BrowserMainLoop::MainMessageLoopStart() {
   {
     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")
@@ -903,6 +903,11 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
   }
 #endif  // !defined(OS_IOS)
 
+  {
+    TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PowerMonitor");
+    base::PowerMonitor::Shutdown();
+  }
+
   if (parts_) {
     TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:PostDestroyThreads");
     parts_->PostDestroyThreads();