Revert of [mojo-edk] Simplify multiprocess pipe bootstrap

mojo/edk/system/node_channel.h

 // Copyright 2016 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_NODE_CHANNEL_H_
 #define MOJO_EDK_SYSTEM_NODE_CHANNEL_H_
 
 #include <unordered_map>
 
 #include "base/macros.h"
@@ skipping 26 matching lines @@
     virtual void OnAddBrokerClient(const ports::NodeName& from_node,
                                    const ports::NodeName& client_name,
                                    ScopedPlatformHandle process_handle) = 0;
     virtual void OnBrokerClientAdded(const ports::NodeName& from_node,
                                      const ports::NodeName& client_name,
                                      ScopedPlatformHandle broker_channel) = 0;
     virtual void OnAcceptBrokerClient(const ports::NodeName& from_node,
                                       const ports::NodeName& broker_name,
                                       ScopedPlatformHandle broker_channel) = 0;
     virtual void OnPortsMessage(Channel::MessagePtr message) = 0;
-    virtual void OnRequestPortMerge(const ports::NodeName& from_node,
-                                    const ports::PortName& connector_port_name,
-                                    const std::string& token) = 0;
+    virtual void OnRequestPortConnection(
+        const ports::NodeName& from_node,
+        const ports::PortName& connector_port_name,
+        const std::string& token) = 0;
+    virtual void OnConnectToPort(
+        const ports::NodeName& from_node,
+        const ports::PortName& connector_port_name,
+        const ports::PortName& connectee_port_name) = 0;
     virtual void OnRequestIntroduction(const ports::NodeName& from_node,
                                        const ports::NodeName& name) = 0;
     virtual void OnIntroduce(const ports::NodeName& from_node,
                              const ports::NodeName& name,
                              ScopedPlatformHandle channel_handle) = 0;
 #if defined(OS_WIN)
     virtual void OnRelayPortsMessage(const ports::NodeName& from_node,
                                      base::ProcessHandle from_process,
                                      const ports::NodeName& destination,
                                      Channel::MessagePtr message) = 0;
@@ skipping 31 matching lines @@
                    const ports::NodeName& token);
   void AcceptParent(const ports::NodeName& token,
                     const ports::NodeName& child_name);
   void AddBrokerClient(const ports::NodeName& client_name,
                        ScopedPlatformHandle process_handle);
   void BrokerClientAdded(const ports::NodeName& client_name,
                          ScopedPlatformHandle broker_channel);
   void AcceptBrokerClient(const ports::NodeName& broker_name,
                           ScopedPlatformHandle broker_channel);
   void PortsMessage(Channel::MessagePtr message);
-  void RequestPortMerge(const ports::PortName& connector_port_name,
-                         const std::string& token);
+  void RequestPortConnection(const ports::PortName& connector_port_name,
+                             const std::string& token);
+  void ConnectToPort(const ports::PortName& connector_port_name,
+                     const ports::PortName& connectee_port_name);
   void RequestIntroduction(const ports::NodeName& name);
   void Introduce(const ports::NodeName& name,
                  ScopedPlatformHandle channel_handle);
 
 #if defined(OS_WIN)
   // Relay the message to the specified node via this channel.  This is used to
   // pass windows handles between two processes that do not have permission to
   // duplicate handles into the other's address space. The relay process is
   // assumed to have that permission.
   void RelayPortsMessage(const ports::NodeName& destination,
@@ skipping 30 matching lines @@
   base::ProcessHandle remote_process_handle_ = base::kNullProcessHandle;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(NodeChannel);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_NODE_CHANNEL_H_