Use ChannelMojo between the remoting network and desktop processes.

remoting/host/desktop_process_unittest.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/desktop_process.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
-#include "ipc/attachment_broker_privileged.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.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_process.h"
 #include "remoting/host/fake_mouse_cursor_monitor.h"
 #include "remoting/host/host_exit_codes.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 class MockDaemonListener : public IPC::Listener {
  public:
   MockDaemonListener() {}
   ~MockDaemonListener() override {}
 
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  MOCK_METHOD1(OnDesktopAttached, void(IPC::PlatformFileForTransit));
+  MOCK_METHOD1(OnDesktopAttached, void(const IPC::ChannelHandle&));
   MOCK_METHOD1(OnChannelConnected, void(int32_t));
   MOCK_METHOD0(OnChannelError, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDaemonListener);
 };
 
 class MockNetworkListener : public IPC::Listener {
  public:
   MockNetworkListener() {}
@@ skipping 31 matching lines @@
   return handled;
 }
 
 }  // namespace
 
 class DesktopProcessTest : public testing::Test {
  public:
   DesktopProcessTest();
   ~DesktopProcessTest() override;
 
-  // testing::Test overrides
-  void SetUp() override;
-  void TearDown() override;
-
   // MockDaemonListener mocks
-  void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process);
-  void OnDesktopAttached(IPC::PlatformFileForTransit desktop_process);
+  void ConnectNetworkChannel(const IPC::ChannelHandle& desktop_process);
+  void OnDesktopAttached(const IPC::ChannelHandle& desktop_process);
 
   // Creates a DesktopEnvironment with a fake webrtc::DesktopCapturer, to mock
   // DesktopEnvironmentFactory::Create().
   DesktopEnvironment* CreateDesktopEnvironment();
 
   // Creates a dummy InputInjector, to mock
   // DesktopEnvironment::CreateInputInjector().
   InputInjector* CreateInputInjector();
 
   // Creates a fake webrtc::DesktopCapturer, to mock
@@ skipping 33 matching lines @@
   // Runs the daemon's end of the channel.
   base::MessageLoopForUI message_loop_;
 
   scoped_refptr<AutoThreadTaskRunner> io_task_runner_;
 
   // The network's end of the network-to-desktop channel.
   std::unique_ptr<IPC::ChannelProxy> network_channel_;
 
   // Delegate that is passed to |network_channel_|.
   MockNetworkListener network_listener_;
+
+  mojo::ScopedMessagePipeHandle desktop_process_channel_;
 };
 
 DesktopProcessTest::DesktopProcessTest() {}
 
 DesktopProcessTest::~DesktopProcessTest() {
 }
 
-void DesktopProcessTest::SetUp() {
-  IPC::AttachmentBrokerPrivileged::CreateBrokerForSingleProcessTests();
-}
-
-void DesktopProcessTest::TearDown() {
-}
-
 void DesktopProcessTest::ConnectNetworkChannel(
-    IPC::PlatformFileForTransit desktop_process) {
-
-#if defined(OS_POSIX)
-  IPC::ChannelHandle channel_handle(std::string(), desktop_process);
-#elif defined(OS_WIN)
-  IPC::ChannelHandle channel_handle(desktop_process.GetHandle());
-#endif  // defined(OS_WIN)
-
+    const IPC::ChannelHandle& channel_handle) {
   network_channel_ =
       IPC::ChannelProxy::Create(channel_handle, IPC::Channel::MODE_CLIENT,
                                 &network_listener_, io_task_runner_.get());
 }
 
 void DesktopProcessTest::OnDesktopAttached(
-    IPC::PlatformFileForTransit desktop_process) {
-#if defined(OS_POSIX)
-    DCHECK(desktop_process.auto_close);
-
-    base::File closer(IPC::PlatformFileForTransitToFile(desktop_process));
-#endif  // defined(OS_POSIX)
+    const IPC::ChannelHandle& desktop_process) {
+  desktop_process_channel_.reset(desktop_process.mojo_handle);
 }
 
 DesktopEnvironment* DesktopProcessTest::CreateDesktopEnvironment() {
   MockDesktopEnvironment* desktop_environment = new MockDesktopEnvironment();
   EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr())
       .Times(0);
   EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr())
       .Times(AtMost(1))
       .WillOnce(Invoke(this, &DesktopProcessTest::CreateInputInjector));
   EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr())
@@ skipping 143 matching lines @@
 }
 
 // Run the desktop process and ask it to crash.
 TEST_F(DesktopProcessTest, DeathTest) {
   testing::GTEST_FLAG(death_test_style) = "threadsafe";
 
   EXPECT_DEATH(RunDeathTest(), "");
 }
 
 }  // namespace remoting