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

Unified Diff: content/worker/worker_main.cc

Issue 17074009: Created multi-process-friendly PowerMonitor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing windows unit test errors 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 | « content/utility/utility_main.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/worker/worker_main.cc
diff --git a/content/worker/worker_main.cc b/content/worker/worker_main.cc
index 9e9f79f0bcf2033f4d2a3b1fcc7004f663a6e842..b6a8fd1a34afeae8081aee696387f99f43c44620 100644
--- a/content/worker/worker_main.cc
+++ b/content/worker/worker_main.cc
@@ -5,7 +5,6 @@
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
-#include "base/power_monitor/power_monitor.h"
#include "base/strings/string_util.h"
#include "base/threading/platform_thread.h"
#include "base/timer/hi_res_timer_manager.h"
@@ -31,9 +30,6 @@ int WorkerMain(const MainFunctionParams& parameters) {
base::MessageLoop main_message_loop;
base::PlatformThread::SetName("CrWorkerMain");
- base::PowerMonitor power_monitor;
- base::HighResolutionTimerManager hi_res_timer_manager;
-
#if defined(OS_WIN)
sandbox::TargetServices* target_services =
parameters.sandbox_info->target_services;
@@ -60,6 +56,8 @@ int WorkerMain(const MainFunctionParams& parameters) {
ChildProcess worker_process;
worker_process.set_main_thread(new WorkerThread());
+ base::HighResolutionTimerManager hi_res_timer_manager;
+
const CommandLine& parsed_command_line = parameters.command_line;
if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) {
ChildProcess::WaitForDebugger("Worker");
« no previous file with comments | « content/utility/utility_main.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698