Changing SpawnChild to return a struct.

mojo/edk/system/node_controller.h

Index: mojo/edk/system/node_controller.h
diff --git a/mojo/edk/system/node_controller.h b/mojo/edk/system/node_controller.h
index df6883ce61537aa41f5609674b50aa11f6b8ba98..919934334fab5e4e7788795428afa10509b5b200 100644
--- a/mojo/edk/system/node_controller.h
+++ b/mojo/edk/system/node_controller.h
@@ -73,7 +73,7 @@ class NodeController : public ports::NodeDelegate,
 
   // Connects this node to a child node. This node will initiate a handshake.
   void ConnectToChild(base::ProcessHandle process_handle,
-                      ScopedPlatformHandle platform_handle,
+                      ConnectionParam connection_param,
                       const std::string& child_token,
                       const ProcessErrorCallback& process_error_callback);
 
@@ -86,11 +86,11 @@ class NodeController : public ports::NodeDelegate,
 
   // Connects this node to a parent node. The parent node will initiate a
   // handshake.
-  void ConnectToParent(ScopedPlatformHandle platform_handle);
+  void ConnectToParent(ConnectionParam connection_param);
 
   // Connects this node to a peer node. On success, |port| will be merged with
   // the corresponding port in the peer node.
-  void ConnectToPeer(ScopedPlatformHandle handle,
+  void ConnectToPeer(ConnectionParam connection_param,
                      const ports::PortRef& port,
                      const std::string& peer_token);
 
@@ -168,12 +168,12 @@ class NodeController : public ports::NodeDelegate,
 
   void ConnectToChildOnIOThread(
       base::ProcessHandle process_handle,
-      ScopedPlatformHandle platform_handle,
+      ConnectionParam connection_param,
       ports::NodeName token,
       const ProcessErrorCallback& process_error_callback);
-  void ConnectToParentOnIOThread(ScopedPlatformHandle platform_handle);
+  void ConnectToParentOnIOThread(ConnectionParam connection_param);
 
-  void ConnectToPeerOnIOThread(ScopedPlatformHandle handle,
+  void ConnectToPeerOnIOThread(ConnectionParam connection_param,
                                ports::NodeName token,
                                ports::PortRef port,
                                const std::string& peer_token);