Revert of Attempting to resolve a race condition with PowerMonitor

base/power_monitor/power_monitor_unittest.cc

 // Copyright 2013 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 "base/power_monitor/power_monitor.h"
 #include "base/test/power_monitor_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 class PowerMonitorTest : public testing::Test {
  protected:
   PowerMonitorTest() {
     power_monitor_source_ = new PowerMonitorTestSource();
-    PowerMonitor::Initialize(
-        scoped_ptr<PowerMonitorSource>(power_monitor_source_));
+    power_monitor_.reset(new PowerMonitor(
+        scoped_ptr<PowerMonitorSource>(power_monitor_source_)));
   }
-  virtual ~PowerMonitorTest() {
-    PowerMonitor::ShutdownForTesting();
-  };
+  virtual ~PowerMonitorTest() {};
 
   PowerMonitorTestSource* source() { return power_monitor_source_; }
+  PowerMonitor* monitor() { return power_monitor_.get(); }
 
  private:
   PowerMonitorTestSource* power_monitor_source_;
+  scoped_ptr<PowerMonitor> power_monitor_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerMonitorTest);
 };
 
 // PowerMonitorSource is tightly coupled with the PowerMonitor, so this test
 // Will cover both classes
 TEST_F(PowerMonitorTest, PowerNotifications) {
   const int kObservers = 5;
 
   PowerMonitorTestObserver observers[kObservers];
   for (int index = 0; index < kObservers; ++index)
-    PowerMonitor::AddObserver(&observers[index]);
+    monitor()->AddObserver(&observers[index]);
 
   // Sending resume when not suspended should have no effect.
   source()->GenerateResumeEvent();
   EXPECT_EQ(observers[0].resumes(), 0);
 
   // Pretend we suspended.
   source()->GenerateSuspendEvent();
   // Ensure all observers were notified of the event
   for (int index = 0; index < kObservers; ++index)
     EXPECT_EQ(observers[index].suspends(), 1);
@@ skipping 23 matching lines @@
   source()->GeneratePowerStateEvent(false);
   EXPECT_EQ(observers[0].power_state_changes(), 2);
   EXPECT_EQ(observers[0].last_power_state(), false);
 
   // Repeated indications the device is off battery power should be suppressed.
   source()->GeneratePowerStateEvent(false);
   EXPECT_EQ(observers[0].power_state_changes(), 2);
 }
 
 }  // namespace base