summaryrefslogtreecommitdiffstats
path: root/remoting/host/chromoting_host_unittest.cc
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2016-02-14 21:59:08 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-15 06:02:01 +0000
commit85df3c48fd4a3be69b1a650cebc793024d4879b3 (patch)
tree8244405ef9eb58f7bcf37f38d9a85f8128cbfa97 /remoting/host/chromoting_host_unittest.cc
parentfce78a10f007fe04532eb1326aba92f9c32b7a22 (diff)
downloadchromium_src-85df3c48fd4a3be69b1a650cebc793024d4879b3.zip
chromium_src-85df3c48fd4a3be69b1a650cebc793024d4879b3.tar.gz
chromium_src-85df3c48fd4a3be69b1a650cebc793024d4879b3.tar.bz2
Use IpcVideoFrameCapturer on network thread instead of capture thread.
Previously IpcVideoFrameCapturer was called on the capturer thread, while all IPC messages are sent and received on the network thread. Now DesktopEnvironment implementations are responsible for creation of DesktopCapturerProxy and MouseCursorMonitorProxy if necessary. This allows to avoid capture thread on windows in the network process. Also cleaned up unnecessary references to various task runners from ChromotingHost and ClientSession. BUG=458437 Review URL: https://codereview.chromium.org/1673723002 Cr-Commit-Position: refs/heads/master@{#375412}
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
-rw-r--r--remoting/host/chromoting_host_unittest.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index f033eee..1b94ed5 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -67,11 +67,7 @@ class ChromotingHostTest : public testing::Test {
desktop_environment_factory_.get(), make_scoped_ptr(session_manager_),
protocol::TransportContext::ForTests(protocol::TransportRole::SERVER),
task_runner_, // Audio
- task_runner_, // Input
- task_runner_, // Video capture
- task_runner_, // Video encode
- task_runner_, // Network
- task_runner_)); // UI
+ task_runner_)); // Video encode
host_->AddStatusObserver(&host_status_observer_);
xmpp_login_ = "host@domain";
@@ -129,13 +125,7 @@ class ChromotingHostTest : public testing::Test {
(connection_index == 0) ? owned_connection1_ : owned_connection2_);
protocol::ConnectionToClient* connection_ptr = connection.get();
scoped_ptr<ClientSession> client(new ClientSession(
- host_.get(),
- task_runner_, // Audio
- task_runner_, // Input
- task_runner_, // Video capture
- task_runner_, // Video encode
- task_runner_, // Network
- task_runner_, // UI
+ host_.get(), task_runner_ /* audio_task_runner */,
std::move(connection), desktop_environment_factory_.get(),
base::TimeDelta(), nullptr, std::vector<HostExtension*>()));
ClientSession* client_ptr = client.get();