Use ChannelMojo between the remoting daemon and network processes.

remoting/host/daemon_process_win.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/daemon_process.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
+#include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/base/scoped_sc_handle_win.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_session_win.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/host_main.h"
 #include "remoting/host/ipc_constants.h"
 #include "remoting/host/pairing_registry_delegate_win.h"
 #include "remoting/host/screen_resolution.h"
@@ skipping 60 matching lines @@
   void DisableAutoStart();
 
   // Initializes the pairing registry on the host side by sending
   // ChromotingDaemonNetworkMsg_InitializePairingRegistry message.
   bool InitializePairingRegistry();
 
   // Opens the pairing registry keys.
   bool OpenPairingRegistry();
 
  private:
+  mojo::edk::ScopedIPCSupport ipc_support_;
+
   std::unique_ptr<WorkerProcessLauncher> network_launcher_;
 
   // Handle of the network process.
   ScopedHandle network_process_;
 
   base::win::RegKey pairing_registry_privileged_key_;
   base::win::RegKey pairing_registry_unprivileged_key_;
 
   DISALLOW_COPY_AND_ASSIGN(DaemonProcessWin);
 };
 
 DaemonProcessWin::DaemonProcessWin(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
     scoped_refptr<AutoThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback)
-    : DaemonProcess(caller_task_runner, io_task_runner, stopped_callback) {
-}
+    : DaemonProcess(caller_task_runner, io_task_runner, stopped_callback),
+      // Mojo holds onto the task runner forever so ignore it when deciding when
+      // to shut down.

[joedow, 2016/10/20 17:40:03]

I'd move this comment to the declaration of the member var as it seems out of
place in the initializer list.  Can you make the comment a bit more clear as to
which 'it' should be ignored.

[Sam McNally, 2016/10/20 22:40:22]

Done.

+      ipc_support_(io_task_runner->underlying_task_runner()) {}
 
 DaemonProcessWin::~DaemonProcessWin() {
 }
 
 void DaemonProcessWin::OnChannelConnected(int32_t peer_pid) {
   // Obtain the handle of the network process.
   network_process_.Set(OpenProcess(PROCESS_DUP_HANDLE, false, peer_pid));
   if (!network_process_.IsValid()) {
     CrashNetworkProcess(FROM_HERE);
     return;
@@ skipping 244 matching lines @@
                 << "\\" << kPairingRegistrySecretsKeyName;
     return false;
   }
 
   pairing_registry_privileged_key_.Set(privileged.Take());
   pairing_registry_unprivileged_key_.Set(unprivileged.Take());
   return true;
 }
 
 }  // namespace remoting