content/public/test/browser_test_base.cc - Issue 17074009: Created multi-process-friendly PowerMonitor interface.

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 17074009: Created multi-process-friendly PowerMonitor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Further simplifying based on @piman's feedback Created 7 years, 5 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:

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 d15e54bab0a7ea706f3ba46357a1cac339ad23ea..25d6330103946d9ed304bf68e87c2fe9efb9219d 100644

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

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

@@ -20,7 +20,7 @@

#if defined(OS_MACOSX)

#include "base/mac/mac_util.h"

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

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

#endif

#if defined(OS_ANDROID)

@@ -67,7 +67,7 @@ BrowserTestBase::BrowserTestBase()

BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))) {

#if defined(OS_MACOSX)

base::mac::SetOverrideAmIBundled(true);

- base::PowerMonitor::AllocateSystemIOPorts();

+ base::PowerMonitorDeviceSource::AllocateSystemIOPorts();

#endif

#if defined(OS_POSIX)