| Index: remoting/host/chromoting_host.cc
|
| diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
|
| index 81ccacfb849e018c012a98cb08a03f045982a563..440004a5902463615860c3751521249c7c10c842 100644
|
| --- a/remoting/host/chromoting_host.cc
|
| +++ b/remoting/host/chromoting_host.cc
|
| @@ -66,12 +66,14 @@ const net::BackoffEntry::Policy kDefaultBackoffPolicy = {
|
| ChromotingHost::ChromotingHost(
|
| DesktopEnvironmentFactory* desktop_environment_factory,
|
| scoped_ptr<protocol::SessionManager> session_manager,
|
| - scoped_refptr<protocol::TransportContext> transport_context,
|
| + scoped_refptr<protocol::TransportContext> ice_transport_context,
|
| + scoped_refptr<protocol::TransportContext> webrtc_transport_context,
|
| scoped_refptr<base::SingleThreadTaskRunner> audio_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),
|
| + ice_transport_context_(ice_transport_context),
|
| + webrtc_transport_context_(webrtc_transport_context),
|
| audio_task_runner_(audio_task_runner),
|
| video_encode_task_runner_(video_encode_task_runner),
|
| started_(false),
|
| @@ -267,10 +269,10 @@ void ChromotingHost::OnIncomingSession(
|
| if (session->config().protocol() ==
|
| protocol::SessionConfig::Protocol::WEBRTC) {
|
| connection.reset(new protocol::WebrtcConnectionToClient(
|
| - make_scoped_ptr(session), transport_context_));
|
| + make_scoped_ptr(session), webrtc_transport_context_));
|
| } else {
|
| connection.reset(new protocol::IceConnectionToClient(
|
| - make_scoped_ptr(session), transport_context_,
|
| + make_scoped_ptr(session), ice_transport_context_,
|
| video_encode_task_runner_));
|
| }
|
|
|
|
|