Index: mojo/runner/child_process_host.cc |
diff --git a/mojo/runner/child_process_host.cc b/mojo/runner/child_process_host.cc |
index f5fe0f54f22308a033c32d1bd81fb610e3a6cbe0..b470a9b47f78eb20d24d826956b2aadeb2a9e0fb 100644 |
--- a/mojo/runner/child_process_host.cc |
+++ b/mojo/runner/child_process_host.cc |
@@ -15,12 +15,12 @@ |
#include "base/task_runner.h" |
#include "base/task_runner_util.h" |
#include "base/thread_task_runner_handle.h" |
-#include "mojo/edk/embedder/embedder.h" |
#include "mojo/public/cpp/bindings/interface_ptr_info.h" |
#include "mojo/public/cpp/system/core.h" |
#include "mojo/runner/context.h" |
#include "mojo/runner/switches.h" |
#include "mojo/runner/task_runners.h" |
+#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
#if defined(OS_LINUX) && !defined(OS_ANDROID) |
#include "sandbox/linux/services/namespace_sandbox.h" |
@@ -156,7 +156,8 @@ void ChildProcessHost::AppCompleted(int32_t result) { |
void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) { |
DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; |
- CHECK(channel_info); |
+ DCHECK(channel_info || |
+ base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")); |
channel_info_ = channel_info; |
} |