Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: net/proxy/proxy_script_fetcher_impl_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: add power notifier 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
Index: net/proxy/proxy_script_fetcher_impl_unittest.cc
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index c12f829493239f38bf2628a2166ad819a5d200b5..cb0a0be8a6bc6a3596f5661c3ed4f40a41bc2a67 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -28,6 +28,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
+#if defined(OS_MACOSX)
+#include "base/power_monitor/power_monitor.h"
+#endif
+
namespace net {
// TODO(eroman):
@@ -210,6 +214,10 @@ class ProxyScriptFetcherImplTest : public PlatformTest {
: test_server_(TestServer::TYPE_HTTP,
net::TestServer::kLocalhost,
FilePath(kDocRoot)) {
+#if defined(OS_MACOSX)
+ // Must be called before PowerMonitor's ctor.
+ base::PowerMonitor::AllocateSystemIOPorts();
+#endif
context_.set_network_delegate(&network_delegate_);
}

Powered by Google App Engine
This is Rietveld 408576698