[mojo-edk] Simplify multiprocess pipe bootstrap

mojo/edk/system/core.cc

 // Copyright 2013 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 "mojo/edk/system/core.h"
 
 #include <string.h>
 
 #include <utility>
 
@@ skipping 142 matching lines @@
   if (base::ThreadTaskRunnerHandle::IsSet()) {
     on_shutdown = base::Bind(base::IgnoreResult(&base::TaskRunner::PostTask),
                              base::ThreadTaskRunnerHandle::Get(),
                              FROM_HERE, callback);
   } else {
     on_shutdown = callback;
   }
   GetNodeController()->RequestShutdown(on_shutdown);
 }
 
-void Core::CreateMessagePipe(
-    ScopedPlatformHandle platform_handle,
-    const base::Callback<void(ScopedMessagePipeHandle)>& callback) {
-  ports::PortRef port;
-  GetNodeController()->node()->CreateUninitializedPort(&port);
+ScopedMessagePipeHandle Core::CreateMessagePipe(
+    ScopedPlatformHandle platform_handle) {
+  ports::PortRef port0, port1;
+  GetNodeController()->node()->CreatePortPair(&port0, &port1);
+  MojoHandle handle = AddDispatcher(
+    new MessagePipeDispatcher(GetNodeController(), port0,
+                              0x7f7f7f7f7f7f7f7fUL, 0));
   RemoteMessagePipeBootstrap::Create(
-      GetNodeController(), std::move(platform_handle), port,
-      base::Bind(&OnPortConnected, base::Unretained(this), 0, callback, port));
+      GetNodeController(), std::move(platform_handle), port1);
+  return ScopedMessagePipeHandle(MessagePipeHandle(handle));
 }
 
 void Core::CreateParentMessagePipe(
     const std::string& token,
     const base::Callback<void(ScopedMessagePipeHandle)>& callback) {
   GetNodeController()->ReservePort(
       token,
       base::Bind(&OnPortConnected, base::Unretained(this), 0, callback));
 }
 
@@ skipping 523 matching lines @@
     scoped_ptr<NodeController> node_controller) {
   // It's OK to leak this reference. At this point we know the IO loop is still
   // running, and we know the NodeController will observe its eventual
   // destruction. This tells the NodeController to delete itself when that
   // happens.
   node_controller.release()->DestroyOnIOThreadShutdown();
 }
 
 }  // namespace edk
 }  // namespace mojo