content/browser/renderer_host/resource_dispatcher_host_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: content/browser/renderer_host/resource_dispatcher_host_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: Call AllocateSystemIOPorts before PowerMonitor's ctor 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_unittest.cc ('K') | « content/browser/gamepad/gamepad_test_helpers.cc ('k') | content/public/test/browser_test_base.cc » ('j') | net/proxy/proxy_script_fetcher_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/resource_dispatcher_host_unittest.cc

diff --git a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc

index cf0ce398d2633c03a364d9007f390c789e6fd368..ccb7be0a2f59a3d6aade4e42a65db1c91f83db2d 100644

--- a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc

+++ b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc

@@ -38,6 +38,10 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "webkit/appcache/appcache_interfaces.h"

+#if defined(OS_MACOSX)

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

+#endif

// TODO(eroman): Write unit tests for SafeBrowsing that exercise

// SafeBrowsingResourceHandler.

@@ -501,6 +505,10 @@ class ResourceDispatcherHostTest : public testing::Test,

old_factory_(NULL),

resource_type_(ResourceType::SUB_RESOURCE),

send_data_received_acks_(false) {

+#if defined(OS_MACOSX)

+ // Call it before PowerMonitor's ctor.

+ base::PowerMonitor::AllocateSystemIOPorts();

+#endif

browser_context_.reset(new content::TestBrowserContext());

BrowserContext::EnsureResourceContextInitialized(browser_context_.get());

message_loop_.RunAllPending();