Index: components/nacl/loader/nacl_listener.cc |
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc |
index 2dfc2bbfdd6379e91f4b62fb8fb7208a7aee8c75..2643c1cd19bb044ad9fb06c964b4ce6957f0774e 100644 |
--- a/components/nacl/loader/nacl_listener.cc |
+++ b/components/nacl/loader/nacl_listener.cc |
@@ -31,6 +31,7 @@ |
#include "ipc/ipc_switches.h" |
#include "ipc/ipc_sync_channel.h" |
#include "ipc/ipc_sync_message_filter.h" |
+#include "mojo/edk/embedder/embedder.h" |
#include "native_client/src/public/chrome_main.h" |
#include "native_client/src/public/nacl_app.h" |
#include "native_client/src/public/nacl_desc.h" |
@@ -166,6 +167,9 @@ NaClListener::NaClListener() |
#endif |
main_loop_(NULL), |
is_started_(false) { |
+ // The Mojo EDK must be initialized before using IPC. |
+ mojo::edk::Init(); |
Mark Seaborn
2016/06/14 20:43:14
NaClMain() in components/nacl/loader/nacl_main.cc
Ken Rockot(use gerrit already)
2016/06/14 20:53:07
Done
Mark Seaborn
2016/06/15 00:35:49
Sorry, scratch that -- nacl_main.cc is not used fo
|
+ |
IPC::AttachmentBrokerUnprivileged::CreateBrokerIfNeeded(); |
io_thread_.StartWithOptions( |
base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); |