Use ChannelMojo between the remoting network and desktop processes.

remoting/host/win/unprivileged_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/unprivileged_process_delegate.h"
 
 #include <sddl.h>
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.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_message.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "remoting/base/typed_buffer.h"
 #include "remoting/host/switches.h"
 #include "remoting/host/win/launch_process_with_token.h"
 #include "remoting/host/win/security_descriptor.h"
 #include "remoting/host/win/window_station_and_desktop.h"
@@ skipping 244 matching lines @@
   WindowStationAndDesktop handles;
   if (!CreateWindowStationAndDesktop(std::move(logon_sid), &handles)) {
     PLOG(ERROR) << "Failed to create a window station and desktop";
     ReportFatalError();
     return;
   }
 
   const std::string mojo_child_token = mojo::edk::GenerateRandomToken();
   const std::string mojo_message_pipe_token = mojo::edk::GenerateRandomToken();
 
-  std::unique_ptr<IPC::ChannelProxy> server =
-      base::MakeUnique<IPC::ChannelProxy>(this, io_task_runner_);
-  IPC::AttachmentBroker::GetGlobal()->RegisterCommunicationChannel(
-      server.get(), io_task_runner_);
-  server->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> server = IPC::ChannelProxy::Create(
+      mojo::edk::CreateParentMessagePipe(mojo_message_pipe_token,
+                                         mojo_child_token)
+          .release(),
+      IPC::Channel::MODE_SERVER, this, io_task_runner_);
   base::CommandLine command_line(target_command_->argv());
   command_line.AppendSwitchASCII(kMojoPipeToken, mojo_message_pipe_token);
 
   base::HandlesToInheritVector handles_to_inherit = {
       handles.desktop(), handles.window_station(),
   };
   mojo::edk::PlatformChannelPair mojo_channel;
   mojo_channel.PrepareToPassClientHandleToChildProcess(&command_line,
                                                        &handles_to_inherit);
 
@@ skipping 23 matching lines @@
 
   if (channel_) {
     channel_->Send(message);
   } else {
     delete message;
   }
 }
 
 void UnprivilegedProcessDelegate::CloseChannel() {
   DCHECK(CalledOnValidThread());
-
-  if (!channel_)
-    return;
-
-  IPC::AttachmentBroker::GetGlobal()->DeregisterCommunicationChannel(
-      channel_.get());
   channel_.reset();
 }
 
 void UnprivilegedProcessDelegate::KillProcess() {
   DCHECK(CalledOnValidThread());
 
   CloseChannel();
   event_handler_ = nullptr;
 
   if (worker_process_.IsValid()) {
@@ skipping 58 matching lines @@
     PLOG(ERROR) << "Failed to duplicate a handle";
     ReportFatalError();
     return;
   }
   ScopedHandle limited_handle(temp_handle);
 
   event_handler_->OnProcessLaunched(std::move(limited_handle));
 }
 
 }  // namespace remoting