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

Unified Diff: components/nacl/loader/nacl_helper_win_64.cc

Issue 2617713002: [WIP] Add DCHECK for mojo::edk::Init().
Patch Set: test Created 3 years, 11 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 | « chromecast/app/cast_unittests_main.cc ('k') | components/nacl/loader/nacl_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_helper_win_64.cc
diff --git a/components/nacl/loader/nacl_helper_win_64.cc b/components/nacl/loader/nacl_helper_win_64.cc
index fb2ebe5fb6714f24f4013e3265a301dddc626b0e..b7e5c4a750e43f4c08dfb92f58b7c9a24f29c28e 100644
--- a/components/nacl/loader/nacl_helper_win_64.cc
+++ b/components/nacl/loader/nacl_helper_win_64.cc
@@ -37,8 +37,6 @@ int NaClBrokerMain(const content::MainFunctionParams& parameters) {
base::MessageLoopForIO main_message_loop;
base::PlatformThread::SetName("CrNaClBrokerMain");
- mojo::edk::Init();
-
std::unique_ptr<base::PowerMonitorSource> power_monitor_source(
new base::PowerMonitorDeviceSource());
base::PowerMonitor power_monitor(std::move(power_monitor_source));
@@ -80,6 +78,8 @@ int NaClWin64Main() {
content::MainFunctionParams main_params(command_line);
main_params.sandbox_info = &sandbox_info;
+ mojo::edk::Init();
+
if (process_type == switches::kNaClLoaderProcess)
return NaClMain(main_params);
« no previous file with comments | « chromecast/app/cast_unittests_main.cc ('k') | components/nacl/loader/nacl_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698