Use ChannelMojo between the remoting daemon and desktop processes.

remoting/host/desktop_process.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.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/desktop_process.h"
 
 #include <utility>
@@ skipping 16 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif  // defined(OS_WIN)
 
 namespace remoting {
 
 DesktopProcess::DesktopProcess(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
     scoped_refptr<AutoThreadTaskRunner> input_task_runner,
-    const std::string& daemon_channel_name)
+    scoped_refptr<AutoThreadTaskRunner> io_task_runner,
+    mojo::ScopedMessagePipeHandle daemon_channel_handle)
     : caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
-      daemon_channel_name_(daemon_channel_name) {
+      io_task_runner_(io_task_runner),
+      daemon_channel_handle_(std::move(daemon_channel_handle)) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
   DCHECK(base::MessageLoopForUI::IsCurrent());
 }
 
 DesktopProcess::~DesktopProcess() {
   DCHECK(!daemon_channel_);
   DCHECK(!desktop_agent_.get());
 }
 
 DesktopEnvironmentFactory& DesktopProcess::desktop_environment_factory() {
@@ skipping 55 matching lines @@
   if (broker && !broker->IsPrivilegedBroker())
     broker->DeregisterBrokerCommunicationChannel(daemon_channel_.get());
   daemon_channel_.reset();
   if (desktop_agent_.get()) {
     desktop_agent_->Stop();
     desktop_agent_ = nullptr;
   }
 
   caller_task_runner_ = nullptr;
   input_task_runner_ = nullptr;
+  io_task_runner_ = nullptr;
   desktop_environment_factory_.reset();
 }
 
 bool DesktopProcess::Start(
     std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
   DCHECK(!desktop_environment_factory_);
   DCHECK(desktop_environment_factory);
 
   IPC::AttachmentBrokerUnprivileged::CreateBrokerIfNeeded();
 
   desktop_environment_factory_ = std::move(desktop_environment_factory);
 
   // Launch the audio capturing thread.
   scoped_refptr<AutoThreadTaskRunner> audio_task_runner;
 #if defined(OS_WIN)
   // On Windows the AudioCapturer requires COM, so we run a single-threaded
   // apartment, which requires a UI thread.
   audio_task_runner =
       AutoThread::CreateWithLoopAndComInitTypes("ChromotingAudioThread",
                                                 caller_task_runner_,
                                                 base::MessageLoop::TYPE_UI,
                                                 AutoThread::COM_INIT_STA);
 #else // !defined(OS_WIN)
   audio_task_runner = AutoThread::CreateWithType(
       "ChromotingAudioThread", caller_task_runner_, base::MessageLoop::TYPE_IO);
 #endif  // !defined(OS_WIN)
 
-  // Launch the I/O thread.
-  scoped_refptr<AutoThreadTaskRunner> io_task_runner =
-      AutoThread::CreateWithType(
-          "I/O thread", caller_task_runner_, base::MessageLoop::TYPE_IO);
-
   // Create a desktop agent.
   desktop_agent_ =
       new DesktopSessionAgent(audio_task_runner, caller_task_runner_,
-                              input_task_runner_, io_task_runner);
+                              input_task_runner_, io_task_runner_);
 
   // Start the agent and create an IPC channel to talk to it.
   IPC::PlatformFileForTransit desktop_pipe;
   if (!desktop_agent_->Start(AsWeakPtr(), &desktop_pipe)) {
     desktop_agent_ = nullptr;
     caller_task_runner_ = nullptr;
     input_task_runner_ = nullptr;
     desktop_environment_factory_.reset();
     return false;
   }
 
   // Connect to the daemon.
-  daemon_channel_.reset(new IPC::ChannelProxy(this, io_task_runner.get()));
+  daemon_channel_.reset(new IPC::ChannelProxy(this, io_task_runner_));
   IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
   if (broker && !broker->IsPrivilegedBroker()) {
     broker->RegisterBrokerCommunicationChannel(daemon_channel_.get());
   }
-  daemon_channel_->Init(daemon_channel_name_, IPC::Channel::MODE_CLIENT,
+  daemon_channel_->Init(daemon_channel_handle_.release(),
+                        IPC::Channel::MODE_CLIENT,
                         /*create_pipe_now=*/true);
 
   // Pass |desktop_pipe| to the daemon.
   daemon_channel_->Send(
       new ChromotingDesktopDaemonMsg_DesktopAttached(desktop_pipe));
 
   return true;
 }
 
 void DesktopProcess::OnCrash(const std::string& function_name,
                              const std::string& file_name,
                              const int& line_number) {
   char message[1024];
   base::snprintf(message, sizeof(message),
                  "Requested by %s at %s, line %d.",
                  function_name.c_str(), file_name.c_str(), line_number);
   base::debug::Alias(message);
 
   // The daemon requested us to crash the process.
   CHECK(false) << message;
 }
 
 } // namespace remoting