Attempting to resolve a race condition with PowerMonitor

base/power_monitor/power_monitor_unittest.cc

Index: base/power_monitor/power_monitor_unittest.cc
diff --git a/base/power_monitor/power_monitor_unittest.cc b/base/power_monitor/power_monitor_unittest.cc
index 5f7b531206f2adcea05f91ffea8db81782f8a9c1..46eafc78dc60c0ee1eda9b7cd60679e3cbcfa763 100644
--- a/base/power_monitor/power_monitor_unittest.cc
+++ b/base/power_monitor/power_monitor_unittest.cc
@@ -12,7 +12,7 @@ class PowerMonitorTest : public testing::Test {
  protected:
   PowerMonitorTest() {
     power_monitor_source_ = new PowerMonitorTestSource();
-    power_monitor_.reset(new PowerMonitor(
+    power_monitor_.reset(PowerMonitor::Create(
         scoped_ptr<PowerMonitorSource>(power_monitor_source_)));
   }
   virtual ~PowerMonitorTest() {};
@@ -34,7 +34,7 @@ TEST_F(PowerMonitorTest, PowerNotifications) {
 
   PowerMonitorTestObserver observers[kObservers];
   for (int index = 0; index < kObservers; ++index)
-    monitor()->AddObserver(&observers[index]);
+    PowerMonitor::AddObserverThreadSafe(&observers[index]);
 
   // Sending resume when not suspended should have no effect.
   source()->GenerateResumeEvent();