Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: remoting/host/ipc_desktop_environment_unittest.cc

Issue 2446053002: Use ChannelMojo between the remoting daemon and desktop processes. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/desktop_process_unittest.cc ('k') | remoting/host/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/ipc_desktop_environment_unittest.cc
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index 6b2799790be0704a95167ec4dfb1f19e774525b2..141682c45117d054408c231e1495b7ee994bfe34 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -215,9 +215,6 @@ class IpcDesktopEnvironmentTest : public testing::Test {
// The daemons's end of the daemon-to-desktop channel.
std::unique_ptr<IPC::ChannelProxy> desktop_channel_;
- // Name of the daemon-to-desktop channel.
- std::string desktop_channel_name_;
-
// Delegate that is passed to |desktop_channel_|.
MockDaemonListener desktop_listener_;
@@ -417,15 +414,14 @@ void IpcDesktopEnvironmentTest::CreateDesktopProcess() {
EXPECT_TRUE(io_task_runner_.get());
// Create the daemon end of the daemon-to-desktop channel.
- desktop_channel_name_ = IPC::Channel::GenerateUniqueRandomChannelID();
+ mojo::MessagePipe pipe;
desktop_channel_ = IPC::ChannelProxy::Create(
- IPC::ChannelHandle(desktop_channel_name_), IPC::Channel::MODE_SERVER,
- &desktop_listener_, io_task_runner_.get());
+ pipe.handle0.release(), IPC::Channel::MODE_SERVER, &desktop_listener_,
+ io_task_runner_.get());
// Create and start the desktop process.
- desktop_process_.reset(new DesktopProcess(task_runner_,
- io_task_runner_,
- desktop_channel_name_));
+ desktop_process_.reset(new DesktopProcess(
+ task_runner_, io_task_runner_, io_task_runner_, std::move(pipe.handle1)));
std::unique_ptr<MockDesktopEnvironmentFactory> desktop_environment_factory(
new MockDesktopEnvironmentFactory());
« no previous file with comments | « remoting/host/desktop_process_unittest.cc ('k') | remoting/host/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698