Revert of [mojo-edk] Simplify multiprocess pipe bootstrap

mojo/edk/embedder/embedder.cc

 // Copyright 2014 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/embedder/embedder.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 89 matching lines @@
 void ShutdownIPCSupport() {
   CHECK(internal::g_process_delegate);
   CHECK(internal::g_core);
   internal::g_core->RequestShutdown(
       base::Bind(&ProcessDelegate::OnShutdownComplete,
                  base::Unretained(internal::g_process_delegate)));
 }
 
 ScopedMessagePipeHandle CreateMessagePipe(
     ScopedPlatformHandle platform_handle) {
-  DCHECK(internal::g_core);
-  return internal::g_core->CreateMessagePipe(std::move(platform_handle));
+  NOTREACHED();
+  return ScopedMessagePipeHandle();
 }
 
 void CreateMessagePipe(
     ScopedPlatformHandle platform_handle,
     const base::Callback<void(ScopedMessagePipeHandle)>& callback) {
   DCHECK(internal::g_core);
-  callback.Run(CreateMessagePipe(std::move(platform_handle)));
-}
-
-ScopedMessagePipeHandle CreateParentMessagePipe(const std::string& token) {
-  DCHECK(internal::g_core);
-  return internal::g_core->CreateParentMessagePipe(token);
+  internal::g_core->CreateMessagePipe(std::move(platform_handle), callback);
 }
 
 void CreateParentMessagePipe(
     const std::string& token,
     const base::Callback<void(ScopedMessagePipeHandle)>& callback) {
-  callback.Run(CreateParentMessagePipe(token));
-}
-
-ScopedMessagePipeHandle CreateChildMessagePipe(const std::string& token) {
   DCHECK(internal::g_core);
-  return internal::g_core->CreateChildMessagePipe(token);
+  internal::g_core->CreateParentMessagePipe(token, callback);
 }
 
 void CreateChildMessagePipe(
     const std::string& token,
     const base::Callback<void(ScopedMessagePipeHandle)>& callback) {
-  callback.Run(CreateChildMessagePipe(token));
+  DCHECK(internal::g_core);
+  internal::g_core->CreateChildMessagePipe(token, callback);
 }
 
 std::string GenerateRandomToken() {
   char random_bytes[16];
   crypto::RandBytes(random_bytes, 16);
   return base::HexEncode(random_bytes, 16);
 }
 
 }  // namespace edk
 }  // namespace mojo