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

Unified Diff: content/plugin/plugin_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/content_tests.gypi ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_main.cc
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 44a701be51f8a1de91add064f7ab73493c21ebcc..e55d2356a05937832d6d4d895aedebd73ece78e9 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -11,7 +11,6 @@
#include "base/bind.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"
@@ -59,9 +58,6 @@ int PluginMain(const MainFunctionParams& parameters) {
base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
kTraceEventPluginProcessSortIndex);
- base::PowerMonitor power_monitor;
- base::HighResolutionTimerManager high_resolution_timer_manager;
-
const CommandLine& parsed_command_line = parameters.command_line;
#if defined(OS_LINUX)
@@ -81,6 +77,7 @@ int PluginMain(const MainFunctionParams& parameters) {
{
ChildProcess plugin_process;
plugin_process.set_main_thread(new PluginThread());
+ base::HighResolutionTimerManager hi_res_timer_manager;
base::MessageLoop::current()->Run();
}
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698