Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Unified Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 10959020: SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Revert using Singleton pattern for PowerMonitor Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0104271f09d5bf3bc9be7e87212722867e463830..ee01e98b0b0e83ba2b3ccd068ae645d3418dd123 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -8,8 +8,8 @@
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/path_service.h"
+#include "base/power_monitor/power_monitor.h"
#include "base/scoped_temp_dir.h"
-#include "base/system_monitor/system_monitor.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -98,9 +98,8 @@ class ProfileManagerTest : public testing::Test {
io_thread_(local_state_.Get(), NULL,
extension_event_router_forwarder_) {
#if defined(OS_MACOSX)
- base::SystemMonitor::AllocateSystemIOPorts();
+ base::PowerMonitor::AllocateSystemIOPorts();
vandebo (ex-Chrome) 2012/10/29 18:04:38 Is this needed?
Hongbo Min 2012/10/30 14:33:47 Remove it now.
#endif
- system_monitor_dummy_.reset(new base::SystemMonitor);
static_cast<TestingBrowserProcess*>(g_browser_process)->SetIOThread(
&io_thread_);
}
@@ -142,8 +141,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) {

Powered by Google App Engine
This is Rietveld 408576698