OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/host/desktop_process.h" | 5 #include "remoting/host/desktop_process.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 void DesktopProcessTest::SetUp() { | 165 void DesktopProcessTest::SetUp() { |
166 } | 166 } |
167 | 167 |
168 void DesktopProcessTest::TearDown() { | 168 void DesktopProcessTest::TearDown() { |
169 } | 169 } |
170 | 170 |
171 void DesktopProcessTest::ConnectNetworkChannel( | 171 void DesktopProcessTest::ConnectNetworkChannel( |
172 IPC::PlatformFileForTransit desktop_process) { | 172 IPC::PlatformFileForTransit desktop_process) { |
173 | 173 |
174 #if defined(OS_POSIX) | 174 #if defined(OS_POSIX) |
175 IPC::ChannelHandle channel_handle("", desktop_process); | 175 IPC::ChannelHandle channel_handle(std::string(), desktop_process); |
176 #elif defined(OS_WIN) | 176 #elif defined(OS_WIN) |
177 IPC::ChannelHandle channel_handle(desktop_process); | 177 IPC::ChannelHandle channel_handle(desktop_process); |
178 #endif // defined(OS_WIN) | 178 #endif // defined(OS_WIN) |
179 | 179 |
180 network_channel_.reset(new IPC::ChannelProxy( | 180 network_channel_.reset(new IPC::ChannelProxy( |
181 channel_handle, | 181 channel_handle, |
182 IPC::Channel::MODE_CLIENT, | 182 IPC::Channel::MODE_CLIENT, |
183 &network_listener_, | 183 &network_listener_, |
184 io_task_runner_)); | 184 io_task_runner_)); |
185 } | 185 } |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 } | 337 } |
338 | 338 |
339 // Run the desktop process and ask it to crash. | 339 // Run the desktop process and ask it to crash. |
340 TEST_F(DesktopProcessTest, DeathTest) { | 340 TEST_F(DesktopProcessTest, DeathTest) { |
341 testing::GTEST_FLAG(death_test_style) = "threadsafe"; | 341 testing::GTEST_FLAG(death_test_style) = "threadsafe"; |
342 | 342 |
343 EXPECT_DEATH(RunDeathTest(), ""); | 343 EXPECT_DEATH(RunDeathTest(), ""); |
344 } | 344 } |
345 | 345 |
346 } // namespace remoting | 346 } // namespace remoting |
OLD | NEW |