Index: chrome/browser/profiles/profile_manager_unittest.cc |
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc |
index c8f01c6677918aac6c9bc56283a7b84bc20a768c..1e52350ea8de030f11d0f01a029a9c45396159ce 100644 |
--- a/chrome/browser/profiles/profile_manager_unittest.cc |
+++ b/chrome/browser/profiles/profile_manager_unittest.cc |
@@ -9,7 +9,7 @@ |
#include "base/files/scoped_temp_dir.h" |
#include "base/message_loop.h" |
#include "base/path_service.h" |
-#include "base/system_monitor/system_monitor.h" |
+#include "base/power_monitor/power_monitor.h" |
vandebo (ex-Chrome)
2013/03/19 23:36:04
Does this need a dummy system monitor, or a dummy
Hongbo Min
2013/03/20 13:01:50
I found neither. I really doubt the purpose of the
|
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
#include "build/build_config.h" |
@@ -98,10 +98,6 @@ class ProfileManagerTest : public testing::Test { |
file_thread_(BrowserThread::FILE, &message_loop_), |
io_thread_(local_state_.Get(), g_browser_process->policy_service(), |
NULL, extension_event_router_forwarder_) { |
-#if defined(OS_MACOSX) |
- base::SystemMonitor::AllocateSystemIOPorts(); |
-#endif |
- system_monitor_dummy_.reset(new base::SystemMonitor); |
TestingBrowserProcess::GetGlobal()->SetIOThread(&io_thread_); |
} |
@@ -141,8 +137,6 @@ class ProfileManagerTest : public testing::Test { |
content::TestBrowserThread file_thread_; |
// IOThread is necessary for the creation of some services below. |
IOThread io_thread_; |
- |
- scoped_ptr<base::SystemMonitor> system_monitor_dummy_; |
}; |
TEST_F(ProfileManagerTest, GetProfile) { |