Use ChannelMojo between the remoting network and desktop processes.

remoting/host/win/wts_session_process_delegate.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/win/wts_session_process_delegate.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/win/scoped_handle.h"
-#include "ipc/attachment_broker.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/named_platform_channel_pair.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/platform_handle_utils.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "remoting/host/host_main.h"
@@ skipping 215 matching lines @@
     delete message;
   }
 }
 
 void WtsSessionProcessDelegate::Core::CloseChannel() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   if (!channel_)
     return;
 
-  IPC::AttachmentBroker::GetGlobal()->DeregisterCommunicationChannel(
-      channel_.get());
   channel_.reset();
   elevated_server_handle_.reset();
   elevated_launcher_pid_ = base::kNullProcessId;
   if (!mojo_child_token_.empty()) {
     mojo::edk::ChildProcessLaunchFailed(mojo_child_token_);
     mojo_child_token_.clear();
   }
 }
 
 void WtsSessionProcessDelegate::Core::KillProcess() {
@@ skipping 87 matching lines @@
 
     // Create the command line passing the name of the IPC channel to use and
     // copying known switches from the caller's command line.
     command_line.SetProgram(helper_binary);
     command_line.AppendSwitchPath(kElevateSwitchName,
                                   target_command_->GetProgram());
   }
 
   const std::string mojo_message_pipe_token = mojo::edk::GenerateRandomToken();
   mojo_child_token_ = mojo::edk::GenerateRandomToken();
-  std::unique_ptr<IPC::ChannelProxy> channel(
-      new IPC::ChannelProxy(this, io_task_runner_));
-  IPC::AttachmentBroker::GetGlobal()->RegisterCommunicationChannel(
-      channel.get(), io_task_runner_);
-  channel->Init(mojo::edk::CreateParentMessagePipe(mojo_message_pipe_token,
-                                                   mojo_child_token_)
-                    .release(),
-                IPC::Channel::MODE_SERVER, /*create_pipe_now=*/true);
+  std::unique_ptr<IPC::ChannelProxy> channel = IPC::ChannelProxy::Create(
+      mojo::edk::CreateParentMessagePipe(mojo_message_pipe_token,
+                                         mojo_child_token_)
+          .release(),
+      IPC::Channel::MODE_SERVER, this, io_task_runner_);
   command_line.AppendSwitchASCII(kMojoPipeToken, mojo_message_pipe_token);
 
   std::unique_ptr<mojo::edk::PlatformChannelPair> normal_mojo_channel;
   std::unique_ptr<mojo::edk::NamedPlatformChannelPair> elevated_mojo_channel;
   base::HandlesToInheritVector handles_to_inherit;
   if (launch_elevated_) {
     // Pass the name of the IPC channel to use.
     mojo::edk::NamedPlatformChannelPair::Options options;
     options.security_descriptor = base::UTF8ToUTF16(channel_security_);
     elevated_mojo_channel =
@@ skipping 214 matching lines @@
 
 void WtsSessionProcessDelegate::CloseChannel() {
   core_->CloseChannel();
 }
 
 void WtsSessionProcessDelegate::KillProcess() {
   core_->KillProcess();
 }
 
 }  // namespace remoting