Revert of Attempting to resolve a race condition with PowerMonitor

chrome/browser/extensions/event_router_forwarder_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/event_router_forwarder.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
@@ skipping 79 matching lines @@
   EventRouterForwarderTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         io_thread_(BrowserThread::IO),
         profile_manager_(
             TestingBrowserProcess::GetGlobal()) {
 #if defined(OS_MACOSX)
     base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
 #endif
     scoped_ptr<base::PowerMonitorSource> power_monitor_source(
       new base::PowerMonitorDeviceSource());
-    base::PowerMonitor::Initialize(power_monitor_source.Pass());
-  }
-
-  virtual ~EventRouterForwarderTest() {
-    base::PowerMonitor::ShutdownForTesting();
+    dummy.reset(new base::PowerMonitor(power_monitor_source.Pass()));
   }
 
   virtual void SetUp() {
     ASSERT_TRUE(profile_manager_.SetUp());
 
     // Inject a BrowserProcess with a ProfileManager.
     ASSERT_TRUE(io_thread_.Start());
 
     profile1_ = profile_manager_.CreateTestingProfile("one");
     profile2_ = profile_manager_.CreateTestingProfile("two");
   }
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   TestingProfileManager profile_manager_;
+  scoped_ptr<base::PowerMonitor> dummy;
   // Profiles are weak pointers, owned by ProfileManager in |browser_process_|.
   TestingProfile* profile1_;
   TestingProfile* profile2_;
 };
 
 TEST_F(EventRouterForwarderTest, BroadcastRendererUI) {
   scoped_refptr<MockEventRouterForwarder> event_router(
       new MockEventRouterForwarder);
   GURL url;
   EXPECT_CALL(*event_router.get(),
@@ skipping 147 matching lines @@
   GURL url;
   EXPECT_CALL(*event_router.get(),
               CallEventRouter(profile1_, kExt, kEventName, NULL, url));
   EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
       .Times(0);
   DispatchEventToExtension(event_router.get(), kExt, kEventName, profile1_,
                            false, url);
 }
 
 }  // namespace extensions