Index: mojo/shell/standalone/context.cc |
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc |
index dc0a25bb59e40f96ab215858be476ae558d16f56..5b538790c7d809959f253c38b84603506b48fcdc 100644 |
--- a/mojo/shell/standalone/context.cc |
+++ b/mojo/shell/standalone/context.cc |
@@ -129,13 +129,15 @@ void Context::Init(scoped_ptr<InitParams> init_params) { |
"mojo_runner.trace"); |
} |
- EnsureEmbedderIsInitialized(); |
+ if (!init_params || init_params->init_edk) |
+ EnsureEmbedderIsInitialized(); |
shell_runner_ = base::MessageLoop::current()->task_runner(); |
blocking_pool_ = |
new base::SequencedWorkerPool(kMaxBlockingPoolThreads, "blocking_pool"); |
- edk::InitIPCSupport(this, io_thread_->task_runner().get()); |
+ if (!init_params || init_params->init_edk) |
+ edk::InitIPCSupport(this, io_thread_->task_runner().get()); |
scoped_ptr<NativeRunnerFactory> runner_factory; |
if (command_line.HasSwitch(switches::kSingleProcess)) { |