Adding a unit test to verify the IPC channel between the network and desktop processes.

remoting/host/ipc_desktop_environment.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/host/ipc_desktop_environment.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/process_util.h"
 #include "base/single_thread_task_runner.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "media/video/capture/screen/screen_capturer.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_session_proxy.h"
 #include "remoting/host/event_executor.h"
 
 namespace remoting {
 
 IpcDesktopEnvironment::IpcDesktopEnvironment(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     const std::string& client_jid,
     const base::Closure& disconnect_callback,
     base::WeakPtr<DesktopSessionConnector> desktop_session_connector)
     : caller_task_runner_(caller_task_runner),
       connected_(false),
       desktop_session_connector_(desktop_session_connector),
       desktop_session_proxy_(new DesktopSessionProxy(caller_task_runner,
+                                                     io_task_runner,
                                                      client_jid,
                                                      disconnect_callback)) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 }
 
 IpcDesktopEnvironment::~IpcDesktopEnvironment() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   if (connected_ && desktop_session_connector_)
     desktop_session_connector_->DisconnectTerminal(desktop_session_proxy_);
@@ skipping 31 matching lines @@
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   if (!connected_) {
     connected_ = true;
     desktop_session_connector_->ConnectTerminal(desktop_session_proxy_);
   }
 }
 
 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     IPC::ChannelProxy* daemon_channel)
     : caller_task_runner_(caller_task_runner),
+      io_task_runner_(io_task_runner),
       daemon_channel_(daemon_channel),
       connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       next_id_(0) {
 }
 
 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 }
 
 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
     const std::string& client_jid,
     const base::Closure& disconnect_callback) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment(
-      caller_task_runner_, client_jid, disconnect_callback,
+      caller_task_runner_, io_task_runner_, client_jid, disconnect_callback,
       connector_factory_.GetWeakPtr()));
 }
 
 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   return AudioCapturer::IsSupported();
 }
 
 void IpcDesktopEnvironmentFactory::ConnectTerminal(
@@ skipping 23 matching lines @@
     int id = i->first;
     active_connections_.erase(i);
 
     VLOG(1) << "Network: unregistered desktop environment " << id;
     daemon_channel_->Send(new ChromotingNetworkHostMsg_DisconnectTerminal(id));
   }
 }
 
 void IpcDesktopEnvironmentFactory::OnDesktopSessionAgentAttached(
     int terminal_id,
-    IPC::PlatformFileForTransit desktop_process,
+    base::ProcessHandle desktop_process,
     IPC::PlatformFileForTransit desktop_pipe) {
   if (!caller_task_runner_->BelongsToCurrentThread()) {
     caller_task_runner_->PostTask(FROM_HERE, base::Bind(
         &IpcDesktopEnvironmentFactory::OnDesktopSessionAgentAttached,
         base::Unretained(this), terminal_id, desktop_process, desktop_pipe));
     return;
   }
 
   ActiveConnectionsList::iterator i = active_connections_.find(terminal_id);
   if (i != active_connections_.end()) {
     i->second->DetachFromDesktop();
     i->second->AttachToDesktop(desktop_process, desktop_pipe);
   } else {
+    base::CloseProcessHandle(desktop_process);
+
 #if defined(OS_POSIX)
-    DCHECK(desktop_process.auto_close);
     DCHECK(desktop_pipe.auto_close);
 
-    base::ClosePlatformFile(desktop_process.fd);
     base::ClosePlatformFile(desktop_pipe.fd);
-#elif defined(OS_WIN)
-    base::ClosePlatformFile(desktop_process);
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_POSIX)
   }
 }
 
 void IpcDesktopEnvironmentFactory::OnTerminalDisconnected(int terminal_id) {
   if (!caller_task_runner_->BelongsToCurrentThread()) {
     caller_task_runner_->PostTask(FROM_HERE, base::Bind(
         &IpcDesktopEnvironmentFactory::OnTerminalDisconnected,
         base::Unretained(this), terminal_id));
     return;
   }
 
   ActiveConnectionsList::iterator i = active_connections_.find(terminal_id);
   if (i != active_connections_.end()) {
     scoped_refptr<DesktopSessionProxy> desktop_session_proxy = i->second;
     active_connections_.erase(i);
 
     // Disconnect the client session.
     desktop_session_proxy->DisconnectSession();
   }
 }
 
 }  // namespace remoting