content/browser/gamepad/gamepad_test_helpers.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/browser/gamepad/gamepad_test_helpers.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: 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

« content/browser/gamepad/gamepad_test_helpers.h ('K') | « content/browser/gamepad/gamepad_test_helpers.h ('k') | content/public/test/browser_test_base.cc » ('j') | net/url_request/url_request_job.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/gamepad/gamepad_test_helpers.cc

diff --git a/content/browser/gamepad/gamepad_test_helpers.cc b/content/browser/gamepad/gamepad_test_helpers.cc

index abf4187a46f602435880285c0a1287955d7b3779..1938483b3ce411d020ca5c2d7c59b5f8c0f5db05 100644

--- a/content/browser/gamepad/gamepad_test_helpers.cc

+++ b/content/browser/gamepad/gamepad_test_helpers.cc

@@ -4,7 +4,7 @@

#include "content/browser/gamepad/gamepad_test_helpers.h"

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

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

#include "content/browser/gamepad/gamepad_service.h"

namespace content {

@@ -38,9 +38,8 @@ void MockGamepadDataFetcher::SetTestData(const WebKit::WebGamepads& new_data) {

GamepadTestHelper::GamepadTestHelper() {

#if defined(OS_MACOSX)

- base::SystemMonitor::AllocateSystemIOPorts();

+ base::PowerMonitor::AllocateSystemIOPorts();

#endif

- system_monitor_.reset(new base::SystemMonitor);

}

GamepadTestHelper::~GamepadTestHelper() {