chrome/browser/profiles/profile_manager_unittest.cc - Issue 10959020: SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Update patch per vandebo's comments 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

« base/power_monitor/power_monitor_win.cc ('K') | « chrome/browser/extensions/event_router_forwarder_unittest.cc ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..9638840938e042d9ec2d0eecb00e30ce0ff3f4c5 100644

--- a/chrome/browser/profiles/profile_manager_unittest.cc

+++ b/chrome/browser/profiles/profile_manager_unittest.cc

@@ -8,6 +8,7 @@

#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"

@@ -98,7 +99,7 @@ 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();

#endif

system_monitor_dummy_.reset(new base::SystemMonitor);

vandebo (ex-Chrome) 2012/10/11 20:49:57 I don't think this line is needed. Please remove

Hongbo Min 2012/10/12 14:43:53 Done.

static_cast<TestingBrowserProcess*>(g_browser_process)->SetIOThread(

« base/power_monitor/power_monitor_win.cc ('K') | « chrome/browser/extensions/event_router_forwarder_unittest.cc ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »