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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/event_router_forwarder_unittest.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/timer/hi_res_timer_manager_win.cc ('k') | chrome/nacl/nacl_main.cc » ('j') | content/browser/power_monitor_message_broadcaster.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/event_router_forwarder_unittest.cc
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
index c77ecbf4818b5c5c34b7264cce5f2b54229c6053..0e6619ab66328fe79939eb493e06e75e32c71490 100644
--- a/chrome/browser/extensions/event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "base/power_monitor/power_monitor.h"
+#include "base/power_monitor/power_monitor_device_source.h"
#include "base/test/thread_test_helper.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -92,9 +93,11 @@ class EventRouterForwarderTest : public testing::Test {
profile_manager_(
TestingBrowserProcess::GetGlobal()) {
#if defined(OS_MACOSX)
- base::PowerMonitor::AllocateSystemIOPorts();
+ base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
#endif
- dummy.reset(new base::PowerMonitor);
+ scoped_ptr<base::PowerMonitorSource> power_monitor_source(
+ new base::PowerMonitorDeviceSource());
+ dummy.reset(new base::PowerMonitor(power_monitor_source.Pass()));
}
virtual void SetUp() {
« no previous file with comments | « base/timer/hi_res_timer_manager_win.cc ('k') | chrome/nacl/nacl_main.cc » ('j') | content/browser/power_monitor_message_broadcaster.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698