Index: chrome/browser/extensions/event_router_forwarder_unittest.cc |
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc |
index c39e081d4eae3c58356329e67bb92a686cccc1a1..0c5379331d2feb4a10c162d0a440512974bdf2cc 100644 |
--- a/chrome/browser/extensions/event_router_forwarder_unittest.cc |
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc |
@@ -6,7 +6,7 @@ |
#include "base/bind.h" |
#include "base/message_loop.h" |
-#include "base/system_monitor/system_monitor.h" |
+#include "base/power_monitor/power_monitor.h" |
#include "base/test/thread_test_helper.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/test/base/testing_browser_process.h" |
@@ -92,9 +92,8 @@ class EventRouterForwarderTest : public testing::Test { |
profile_manager_( |
static_cast<TestingBrowserProcess*>(g_browser_process)) { |
#if defined(OS_MACOSX) |
- base::SystemMonitor::AllocateSystemIOPorts(); |
+ base::PowerMonitor::AllocateSystemIOPorts(); |
#endif |
- dummy.reset(new base::SystemMonitor); |
} |
virtual void SetUp() { |
@@ -118,7 +117,6 @@ class EventRouterForwarderTest : public testing::Test { |
content::TestBrowserThread ui_thread_; |
content::TestBrowserThread io_thread_; |
TestingProfileManager profile_manager_; |
- scoped_ptr<base::SystemMonitor> dummy; |
// Profiles are weak pointers, owned by ProfileManager in |browser_process_|. |
TestingProfile* profile1_; |
TestingProfile* profile2_; |