[mojo] Ports EDK

content/common/mojo/channel_init.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/mojo/channel_init.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
+#include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 
 namespace content {
 
+namespace {
+
+void CallMessagePipeCallbackOnThread(
+    const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback,
+    scoped_refptr<base::TaskRunner> task_runner,
+    mojo::ScopedMessagePipeHandle pipe) {
+  task_runner->PostTask(FROM_HERE, base::Bind(callback, base::Passed(&pipe)));
+}
+
+}  // namespace
+
 ChannelInit::ChannelInit() : channel_info_(nullptr), weak_factory_(this) {}
 
 ChannelInit::~ChannelInit() {
   if (channel_info_)
     mojo::embedder::DestroyChannel(channel_info_,
                                    base::Bind(&base::DoNothing), nullptr);
 }
 
-mojo::ScopedMessagePipeHandle ChannelInit::Init(
+void ChannelInit::Init(
     base::PlatformFile file,
-    scoped_refptr<base::TaskRunner> io_thread_task_runner) {
+    scoped_refptr<base::TaskRunner> io_thread_task_runner,
+    const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback) {
   scoped_ptr<IPC::ScopedIPCSupport> ipc_support(
       new IPC::ScopedIPCSupport(io_thread_task_runner));
-  mojo::ScopedMessagePipeHandle message_pipe = mojo::embedder::CreateChannel(
-      mojo::embedder::ScopedPlatformHandle(
-          mojo::embedder::PlatformHandle(file)),
-      base::Bind(&ChannelInit::OnCreatedChannel, weak_factory_.GetWeakPtr(),
-                 base::Passed(&ipc_support)),
-      base::ThreadTaskRunnerHandle::Get());
-  return message_pipe;
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) {
+    mojo::edk::CreateMessagePipe(
+        mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(file)),
+        base::Bind(&CallMessagePipeCallbackOnThread,
+                   base::Bind(&ChannelInit::OnCreateMessagePipe,
+                              weak_factory_.GetWeakPtr(),
+                              base::Passed(&ipc_support),
+                              callback),
+                   base::ThreadTaskRunnerHandle::Get()));
+  } else {
+    mojo::ScopedMessagePipeHandle message_pipe = mojo::embedder::CreateChannel(
+        mojo::embedder::ScopedPlatformHandle(
+            mojo::embedder::PlatformHandle(file)),
+        base::Bind(&ChannelInit::OnCreatedChannel, weak_factory_.GetWeakPtr(),
+                   base::Passed(&ipc_support)),
+        base::ThreadTaskRunnerHandle::Get());
+    callback.Run(std::move(message_pipe));
+  }
 }
 
 void ChannelInit::WillDestroySoon() {
   if (channel_info_)
     mojo::embedder::WillDestroyChannelSoon(channel_info_);
 }
 
 // static
 void ChannelInit::OnCreatedChannel(
     base::WeakPtr<ChannelInit> self,
     scoped_ptr<IPC::ScopedIPCSupport> ipc_support,
     mojo::embedder::ChannelInfo* channel) {
   // If |self| was already destroyed, shut the channel down.
   if (!self) {
     mojo::embedder::DestroyChannel(channel,
                                    base::Bind(&base::DoNothing), nullptr);
     return;
   }
 
   DCHECK(!self->channel_info_);
   self->channel_info_ = channel;
   self->ipc_support_ = std::move(ipc_support);
 }
 
+void ChannelInit::OnCreateMessagePipe(
+    scoped_ptr<IPC::ScopedIPCSupport> ipc_support,
+    const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback,
+    mojo::ScopedMessagePipeHandle pipe) {
+  ipc_support_ = std::move(ipc_support);
+  callback.Run(std::move(pipe));
+}
+
 }  // namespace content