[mojo-edk] Pass process handle through the broker on all platforms.

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 18 matching lines @@
    public:
     virtual ~Delegate() {}
     virtual void OnAcceptChild(const ports::NodeName& from_node,
                                const ports::NodeName& parent_name,
                                const ports::NodeName& token) = 0;
     virtual void OnAcceptParent(const ports::NodeName& from_node,
                                 const ports::NodeName& token,
                                 const ports::NodeName& child_name) = 0;
     virtual void OnAddBrokerClient(const ports::NodeName& from_node,
                                    const ports::NodeName& client_name,
-                                   ScopedPlatformHandle process_handle) = 0;
+                                   base::ProcessHandle 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;
@@ skipping 25 matching lines @@
                                   size_t* num_data_bytes);
 
   // Start receiving messages.
   void Start();
 
   // Permanently stop the channel from sending or receiving messages.
   void ShutDown();
 
   void SetRemoteProcessHandle(base::ProcessHandle process_handle);
   bool HasRemoteProcessHandle();
-  ScopedPlatformHandle CopyRemoteProcessHandle();
+  // Note: The returned |ProcessHandle| is owned by the caller and should be
+  // freed if necessary.
+  base::ProcessHandle CopyRemoteProcessHandle();
 
   // Used for context in Delegate calls (via |from_node| arguments.)
   void SetRemoteNodeName(const ports::NodeName& name);
 
   void AcceptChild(const ports::NodeName& parent_name,
                    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);
+                       base::ProcessHandle 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 RequestIntroduction(const ports::NodeName& name);
   void Introduce(const ports::NodeName& name,
                  ScopedPlatformHandle channel_handle);
@@ skipping 25 matching lines @@
 
   Delegate* const delegate_;
   const scoped_refptr<base::TaskRunner> io_task_runner_;
 
   base::Lock channel_lock_;
   scoped_refptr<Channel> channel_;
 
   // Must only be accessed from |io_task_runner_|'s thread.
   ports::NodeName remote_node_name_;
 
-#if defined(OS_WIN)
   base::Lock remote_process_handle_lock_;
   base::ProcessHandle remote_process_handle_ = base::kNullProcessHandle;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(NodeChannel);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_NODE_CHANNEL_H_