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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/message_loop_proxy.h" | 8 #include "base/message_loop_proxy.h" |
9 #include "remoting/base/auto_thread_task_runner.h" | 9 #include "remoting/base/auto_thread_task_runner.h" |
10 #include "remoting/capturer/video_frame_capturer_fake.h" | 10 #include "remoting/capturer/video_frame_capturer_fake.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 scoped_refptr<ClientSession> client = new ClientSession( | 237 scoped_refptr<ClientSession> client = new ClientSession( |
238 host_.get(), | 238 host_.get(), |
239 ui_task_runner_, // Audio | 239 ui_task_runner_, // Audio |
240 ui_task_runner_, // Video capture | 240 ui_task_runner_, // Video capture |
241 ui_task_runner_, // Video encode | 241 ui_task_runner_, // Video encode |
242 ui_task_runner_, // Network | 242 ui_task_runner_, // Network |
243 connection.Pass(), | 243 connection.Pass(), |
244 desktop_environment_factory_.get(), | 244 desktop_environment_factory_.get(), |
245 base::TimeDelta()); | 245 base::TimeDelta()); |
246 connection_ptr->set_host_stub(client); | 246 connection_ptr->set_host_stub(client); |
| 247 connection_ptr->set_input_stub( |
| 248 client->desktop_environment()->event_executor()); |
247 | 249 |
248 ui_task_runner_->PostTask( | 250 ui_task_runner_->PostTask( |
249 FROM_HERE, base::Bind(&ChromotingHostTest::AddClientToHost, | 251 FROM_HERE, base::Bind(&ChromotingHostTest::AddClientToHost, |
250 host_, client)); | 252 host_, client)); |
251 | 253 |
252 if (authenticate) { | 254 if (authenticate) { |
253 ui_task_runner_->PostTask( | 255 ui_task_runner_->PostTask( |
254 FROM_HERE, base::Bind(&ClientSession::OnConnectionAuthenticated, | 256 FROM_HERE, base::Bind(&ClientSession::OnConnectionAuthenticated, |
255 client, connection_ptr)); | 257 client, connection_ptr)); |
256 if (!reject) { | 258 if (!reject) { |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
688 ExpectClientDisconnected(0, true, video_packet_sent, | 690 ExpectClientDisconnected(0, true, video_packet_sent, |
689 InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); | 691 InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); |
690 EXPECT_CALL(host_status_observer_, OnShutdown()); | 692 EXPECT_CALL(host_status_observer_, OnShutdown()); |
691 | 693 |
692 host_->Start(xmpp_login_); | 694 host_->Start(xmpp_login_); |
693 SimulateClientConnection(0, true, false); | 695 SimulateClientConnection(0, true, false); |
694 message_loop_.Run(); | 696 message_loop_.Run(); |
695 } | 697 } |
696 | 698 |
697 } // namespace remoting | 699 } // namespace remoting |
OLD | NEW |