[Chromoting] The desktop process now creates a pre-connected pipe and passes (with some help of the…

remoting/host/ipc_desktop_environment_factory.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_factory.h"
 
 #include <utility>
 
 #include "ipc/ipc_channel_proxy.h"
+#include "base/platform_file.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_session_connector.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/ipc_desktop_environment.h"
 #include "remoting/host/video_frame_capturer.h"
 
 namespace remoting {
@@ skipping 10 matching lines @@
 }
 
 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
 }
 
 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
     ClientSession* client) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
 
   return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment(
-      input_task_runner_, ui_task_runner_, this, client));
+      input_task_runner_, network_task_runner_, ui_task_runner_, this, client));
 }
 
 void IpcDesktopEnvironmentFactory::ConnectTerminal(
     IpcDesktopEnvironment* desktop_environment) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
 
   int id = next_id_++;
   bool inserted = active_connections_.insert(
       std::make_pair(id, desktop_environment)).second;
   CHECK(inserted);
@@ skipping 14 matching lines @@
 
   if (i != active_connections_.end()) {
     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,
+    IPC::PlatformFileForTransit desktop_pipe) {
+  if (!network_task_runner_->BelongsToCurrentThread()) {
+    network_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->OnDesktopSessionAgentAttached(desktop_process, desktop_pipe);
+  } else {
+#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)
+  }
+}
+
 void IpcDesktopEnvironmentFactory::OnTerminalDisconnected(int terminal_id) {
   if (!network_task_runner_->BelongsToCurrentThread()) {
     network_task_runner_->PostTask(FROM_HERE, base::Bind(
         &IpcDesktopEnvironmentFactory::OnTerminalDisconnected,
         base::Unretained(this), terminal_id));
     return;
   }
 
-  ActiveConnectionsList::iterator i =
-      active_connections_.find(terminal_id);
+  ActiveConnectionsList::iterator i = active_connections_.find(terminal_id);
   if (i != active_connections_.end()) {
     IpcDesktopEnvironment* desktop_environment = i->second;
     active_connections_.erase(i);
 
     // Disconnect the client for the given desktop environment.
     desktop_environment->DisconnectClient();
   }
 }
 
 }  // namespace remoting