Index: chrome/nacl/nacl_main.cc |
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc |
index 05164956d4f6f560afb97635646ce000804a252f..5271cf4b1837d094c237e044dca42840b0d2424e 100644 |
--- a/chrome/nacl/nacl_main.cc |
+++ b/chrome/nacl/nacl_main.cc |
@@ -10,10 +10,11 @@ |
#include "sandbox/src/sandbox.h" |
#endif |
+#include "app/hi_res_timer_manager.h" |
+#include "app/system_monitor.h" |
#include "base/command_line.h" |
#include "base/message_loop.h" |
#include "base/string_util.h" |
-#include "base/system_monitor.h" |
#include "chrome/common/child_process.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_switches.h" |
@@ -28,8 +29,8 @@ int NaClMain(const MainFunctionParams& parameters) { |
std::wstring app_name = chrome::kBrowserAppName; |
PlatformThread::SetName(WideToASCII(app_name + L"_NaClMain").c_str()); |
- // Initialize the SystemMonitor |
- base::SystemMonitor::Start(); |
+ SystemMonitor system_monitor; |
+ HighResolutionTimerManager hi_res_timer_manager; |
#if defined(OS_WIN) |
const CommandLine& parsed_command_line = parameters.command_line_; |