diff options
Diffstat (limited to 'mojo/shell/standalone/context.cc')
| -rw-r--r-- | mojo/shell/standalone/context.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc index dc0a25b..5b53879 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)) { |