[mojo-edk] Simplify multiprocess pipe bootstrap

mojo/edk/system/core.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_CORE_H_
 #define MOJO_EDK_SYSTEM_CORE_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 34 matching lines @@
 
   scoped_refptr<Dispatcher> GetDispatcher(MojoHandle handle);
 
   // Called in the parent process any time a new child is launched.
   void AddChild(base::ProcessHandle process_handle,
                 ScopedPlatformHandle platform_handle);
 
   // Called in a child process exactly once during early initialization.
   void InitChild(ScopedPlatformHandle platform_handle);
 
-  // This creates a message pipe endpoint connected to an endpoint in a remote
+  // Creates a message pipe endpoint connected to an endpoint in a remote
   // embedder. |platform_handle| is used as a channel to negotiate the
-  // connection. This is only here to facilitate legacy embedder code. See
-  // mojo::edk::CreateMessagePipe in mojo/edk/embedder/embedder.h.
-  void CreateMessagePipe(
-      ScopedPlatformHandle platform_handle,
-      const base::Callback<void(ScopedMessagePipeHandle)>& callback);
+  // connection.
+  ScopedMessagePipeHandle CreateMessagePipe(
+      ScopedPlatformHandle platform_handle);
 
   // Creates a message pipe endpoint associated with |token|, which a child
   // holding the token can later locate and connect to.
-  void CreateParentMessagePipe(
-      const std::string& token,
-      const base::Callback<void(ScopedMessagePipeHandle)>& callback);
+  ScopedMessagePipeHandle CreateParentMessagePipe(const std::string& token);
 
-  // Creates a message pipe endpoint associated with |token|, which will be
-  // passed to the parent in order to find an associated remote port and connect
-  // to it.
-  void CreateChildMessagePipe(
-      const std::string& token,
-      const base::Callback<void(ScopedMessagePipeHandle)>& callback);
+  // Creates a message pipe endpoint and connects it to a pipe the parent has
+  // associated with |token|.
+  ScopedMessagePipeHandle CreateChildMessagePipe(const std::string& token);
 
   MojoHandle AddDispatcher(scoped_refptr<Dispatcher> dispatcher);
 
   // Adds new dispatchers for non-message-pipe handles received in a message.
   // |dispatchers| and |handles| should be the same size.
   bool AddDispatchersFromTransit(
       const std::vector<Dispatcher::DispatcherInTransit>& dispatchers,
       MojoHandle* handles);
 
   MojoResult CreatePlatformHandleWrapper(ScopedPlatformHandle platform_handle,
@@ skipping 143 matching lines @@
   base::Lock mapping_table_lock_;  // Protects |mapping_table_|.
   MappingTable mapping_table_;
 
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CORE_H_