[mojo-edk] Simplify multiprocess pipe bootstrap

mojo/edk/system/node_channel.h

Index: mojo/edk/system/node_channel.h
diff --git a/mojo/edk/system/node_channel.h b/mojo/edk/system/node_channel.h
index a9bc520c226cbea2855405a94a3b72f1b2deb6b0..2bc86bd2597f9559e34c0968b45bea32aa70761c 100644
--- a/mojo/edk/system/node_channel.h
+++ b/mojo/edk/system/node_channel.h
@@ -44,14 +44,9 @@ class NodeChannel : public base::RefCountedThreadSafe<NodeChannel>,
                                       const ports::NodeName& broker_name,
                                       ScopedPlatformHandle broker_channel) = 0;
     virtual void OnPortsMessage(Channel::MessagePtr message) = 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 OnRequestPortMerge(const ports::NodeName& from_node,
+                                    const ports::PortName& connector_port_name,
+                                    const std::string& token) = 0;
     virtual void OnRequestIntroduction(const ports::NodeName& from_node,
                                        const ports::NodeName& name) = 0;
     virtual void OnIntroduce(const ports::NodeName& from_node,
@@ -103,10 +98,8 @@ class NodeChannel : public base::RefCountedThreadSafe<NodeChannel>,
   void AcceptBrokerClient(const ports::NodeName& broker_name,
                           ScopedPlatformHandle broker_channel);
   void PortsMessage(Channel::MessagePtr message);
-  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 RequestPortMerge(const ports::PortName& connector_port_name,
+                         const std::string& token);
   void RequestIntroduction(const ports::NodeName& name);
   void Introduce(const ports::NodeName& name,
                  ScopedPlatformHandle channel_handle);