Revert of Attempting to resolve a race condition with PowerMonitor

content/browser/power_monitor_message_broadcaster_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/test/power_monitor_test_base.h"
 #include "content/browser/power_monitor_message_broadcaster.h"
 #include "content/common/power_monitor_messages.h"
 #include "ipc/ipc_sender.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 32 matching lines @@
  private:
   int power_state_changes_;  // Count of OnPowerStateChange notifications.
   int suspends_;  // Count of OnSuspend notifications.
   int resumes_;  // Count of OnResume notifications.
 };
 
 class PowerMonitorMessageBroadcasterTest : public testing::Test {
  protected:
   PowerMonitorMessageBroadcasterTest() {
     power_monitor_source_ = new base::PowerMonitorTestSource();
-    base::PowerMonitor::Initialize(
-        scoped_ptr<base::PowerMonitorSource>(power_monitor_source_));
+    power_monitor_.reset(new base::PowerMonitor(
+        scoped_ptr<base::PowerMonitorSource>(power_monitor_source_)));
   }
-  virtual ~PowerMonitorMessageBroadcasterTest() {
-    base::PowerMonitor::ShutdownForTesting();
-  };
+  virtual ~PowerMonitorMessageBroadcasterTest() {};
 
   base::PowerMonitorTestSource* source() { return power_monitor_source_; }
+  base::PowerMonitor* monitor() { return power_monitor_.get(); }
 
  private:
   base::PowerMonitorTestSource* power_monitor_source_;
+  scoped_ptr<base::PowerMonitor> power_monitor_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerMonitorMessageBroadcasterTest);
 };
 
 TEST_F(PowerMonitorMessageBroadcasterTest, PowerMessageBroadcast) {
   PowerMonitorMessageSender sender;
   PowerMonitorMessageBroadcaster broadcaster(&sender);
 
   // Sending resume when not suspended should have no effect.
   source()->GenerateResumeEvent();
@@ skipping 26 matching lines @@
   // Pretend the device has gone off battery power
   source()->GeneratePowerStateEvent(false);
   EXPECT_EQ(sender.power_state_changes(), 2);
 
   // Repeated indications the device is off battery power should be suppressed.
   source()->GeneratePowerStateEvent(false);
   EXPECT_EQ(sender.power_state_changes(), 2);
 }
 
 }  // namespace base