diff options
Diffstat (limited to 'remoting/host/desktop_process_unittest.cc')
| -rw-r--r-- | remoting/host/desktop_process_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc index d83d803265..19e5b5694f 100644 --- a/remoting/host/desktop_process_unittest.cc +++ b/remoting/host/desktop_process_unittest.cc @@ -175,10 +175,10 @@ void DesktopProcessTest::ConnectNetworkChannel( IPC::ChannelHandle channel_handle(desktop_process); #endif // defined(OS_WIN) - network_channel_.reset(new IPC::ChannelProxy(channel_handle, + network_channel_ = IPC::ChannelProxy::Create(channel_handle, IPC::Channel::MODE_CLIENT, &network_listener_, - io_task_runner_.get())); + io_task_runner_.get()); } void DesktopProcessTest::OnDesktopAttached( @@ -186,7 +186,7 @@ void DesktopProcessTest::OnDesktopAttached( #if defined(OS_POSIX) DCHECK(desktop_process.auto_close); - base::ClosePlatformFile(desktop_process.fd); + base::File closer(IPC::PlatformFileForTransitToFile(desktop_process)); #endif // defined(OS_POSIX) } @@ -246,10 +246,10 @@ void DesktopProcessTest::RunDesktopProcess() { "IPC thread", ui_task_runner, base::MessageLoop::TYPE_IO); std::string channel_name = IPC::Channel::GenerateUniqueRandomChannelID(); - daemon_channel_.reset(new IPC::ChannelProxy(IPC::ChannelHandle(channel_name), + daemon_channel_ = IPC::ChannelProxy::Create(IPC::ChannelHandle(channel_name), IPC::Channel::MODE_SERVER, &daemon_listener_, - io_task_runner_.get())); + io_task_runner_.get()); scoped_ptr<MockDesktopEnvironmentFactory> desktop_environment_factory( new MockDesktopEnvironmentFactory()); |