Use ChannelMojo between the remoting network 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>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
-#include "ipc/attachment_broker_unprivileged.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/desktop_session_agent.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif  // defined(OS_WIN)
@@ skipping 66 matching lines @@
 }
 
 void DesktopProcess::OnChannelConnected(int32_t peer_pid) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   VLOG(1) << "IPC: desktop <- daemon (" << peer_pid << ")";
 }
 
 void DesktopProcess::OnChannelError() {
   // Shutdown the desktop process.
-  IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
-  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)
 
   // Create a desktop agent.
   desktop_agent_ =
       new DesktopSessionAgent(audio_task_runner, caller_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;
-  }
+  mojo::ScopedMessagePipeHandle desktop_pipe =
+      desktop_agent_->Start(AsWeakPtr());
 
   // Connect to the daemon.
-  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_handle_.release(),
-                        IPC::Channel::MODE_CLIENT,
-                        /*create_pipe_now=*/true);
+  daemon_channel_ = IPC::ChannelProxy::Create(daemon_channel_handle_.release(),
+                                              IPC::Channel::MODE_CLIENT, this,
+                                              io_task_runner_);
 
   // Pass |desktop_pipe| to the daemon.
   daemon_channel_->Send(
-      new ChromotingDesktopDaemonMsg_DesktopAttached(desktop_pipe));
+      new ChromotingDesktopDaemonMsg_DesktopAttached(desktop_pipe.release()));
 
   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