content/public/test/browser_test_base.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: content/public/test/browser_test_base.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 Created 8 years, 1 month 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_unittest.cc ('K') | « content/browser/gamepad/gamepad_test_helpers.cc ('k') | content/test/net/url_request_abort_on_end_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/browser_test_base.cc

diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc

index dde5a1ddc9e54d32fe8dcf498b256a4b67137990..f050048c26214df243c0093f290a188df327b908 100644

--- a/content/public/test/browser_test_base.cc

+++ b/content/public/test/browser_test_base.cc

@@ -13,7 +13,7 @@

#if defined(OS_MACOSX)

#include "base/mac/mac_util.h"

-#include "base/system_monitor/system_monitor.h"

+#include "base/power_monitor/power_monitor.h"

#endif

namespace {

@@ -42,7 +42,7 @@ extern int BrowserMain(const content::MainFunctionParams&);

BrowserTestBase::BrowserTestBase() {

#if defined(OS_MACOSX)

base::mac::SetOverrideAmIBundled(true);

- base::SystemMonitor::AllocateSystemIOPorts();

+ base::PowerMonitor::AllocateSystemIOPorts();

#endif

#if defined(OS_POSIX)