Use IpcVideoFrameCapturer on network thread instead of capturer thread.

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/chromoting_host.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 50 matching lines @@
   false,
 };
 
 }  // namespace
 
 ChromotingHost::ChromotingHost(
     DesktopEnvironmentFactory* desktop_environment_factory,
     scoped_ptr<protocol::SessionManager> session_manager,
     scoped_refptr<protocol::TransportContext> transport_context,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
     : desktop_environment_factory_(desktop_environment_factory),
       session_manager_(std::move(session_manager)),
       transport_context_(transport_context),
       audio_task_runner_(audio_task_runner),
-      input_task_runner_(input_task_runner),
-      video_capture_task_runner_(video_capture_task_runner),
       video_encode_task_runner_(video_encode_task_runner),
-      network_task_runner_(network_task_runner),
-      ui_task_runner_(ui_task_runner),
       started_(false),
       login_backoff_(&kDefaultBackoffPolicy),
       enable_curtaining_(false),
       weak_factory_(this) {
-  DCHECK(network_task_runner_->BelongsToCurrentThread());
-
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 }
 
 ChromotingHost::~ChromotingHost() {
   DCHECK(CalledOnValidThread());
 
   // Disconnect all of the clients.
   while (!clients_.empty()) {
     clients_.front()->DisconnectSession(protocol::OK);
   }
@@ skipping 34 matching lines @@
   extensions_.push_back(extension.release());
 }
 
 void ChromotingHost::SetAuthenticatorFactory(
     scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) {
   DCHECK(CalledOnValidThread());
   session_manager_->set_authenticator_factory(std::move(authenticator_factory));
 }
 
 void ChromotingHost::SetEnableCurtaining(bool enable) {
-  DCHECK(network_task_runner_->BelongsToCurrentThread());
+  DCHECK(CalledOnValidThread());
 
   if (enable_curtaining_ == enable)
     return;
 
   enable_curtaining_ = enable;
   desktop_environment_factory_->SetEnableCurtaining(enable_curtaining_);
 
   // Disconnect all existing clients because they might be running not
   // curtained.
   // TODO(alexeypa): fix this such that the curtain is applied to the not
@@ skipping 122 matching lines @@
       protocol::SessionConfig::Protocol::WEBRTC) {
     connection.reset(new protocol::WebrtcConnectionToClient(
         make_scoped_ptr(session), transport_context_));
   } else {
     connection.reset(new protocol::IceConnectionToClient(
         make_scoped_ptr(session), transport_context_,
         video_encode_task_runner_));
   }
 
   // Create a ClientSession object.
-  ClientSession* client = new ClientSession(
-      this, audio_task_runner_, input_task_runner_, video_capture_task_runner_,
-      video_encode_task_runner_, network_task_runner_, ui_task_runner_,
-      std::move(connection), desktop_environment_factory_,
-      max_session_duration_, pairing_registry_, extensions_.get());
+  ClientSession* client =
+      new ClientSession(this, audio_task_runner_, std::move(connection),
+                        desktop_environment_factory_, max_session_duration_,
+                        pairing_registry_, extensions_.get());
 
   clients_.push_back(client);
 }
 
 void ChromotingHost::DisconnectAllClients() {
   DCHECK(CalledOnValidThread());
 
   while (!clients_.empty()) {
     size_t size = clients_.size();
     clients_.front()->DisconnectSession(protocol::OK);
     CHECK_EQ(clients_.size(), size - 1);
   }
 }
 
 }  // namespace remoting