Attempting to resolve a race condition with PowerMonitor

content/child/power_monitor_broadcast_source_unittest.cc

Index: content/child/power_monitor_broadcast_source_unittest.cc
diff --git a/content/child/power_monitor_broadcast_source_unittest.cc b/content/child/power_monitor_broadcast_source_unittest.cc
index b665e90bbb05a4494e2782ec78f261e3c2edebad..263cec17f483f97a532b7fae473697b7e165c0ec 100644
--- a/content/child/power_monitor_broadcast_source_unittest.cc
+++ b/content/child/power_monitor_broadcast_source_unittest.cc
@@ -14,7 +14,7 @@ class PowerMonitorBroadcastSourceTest : public testing::Test {
  protected:
   PowerMonitorBroadcastSourceTest() {
     power_monitor_source_ = new PowerMonitorBroadcastSource();
-    power_monitor_.reset(new base::PowerMonitor(
+    power_monitor_.reset(base::PowerMonitor::Create(
         scoped_ptr<base::PowerMonitorSource>(power_monitor_source_)));
   }
   virtual ~PowerMonitorBroadcastSourceTest() {}
@@ -36,7 +36,7 @@ TEST_F(PowerMonitorBroadcastSourceTest, PowerMessageReceiveBroadcast) {
     source()->GetMessageFilter();
 
   base::PowerMonitorTestObserver observer;
-  monitor()->AddObserver(&observer);
+  base::PowerMonitor::AddObserverThreadSafe(&observer);
 
   PowerMonitorMsg_Suspend suspend_msg;
   PowerMonitorMsg_Resume resume_msg;