| Index: remoting/protocol/webrtc_transport.cc
|
| diff --git a/remoting/protocol/webrtc_transport.cc b/remoting/protocol/webrtc_transport.cc
|
| index 665ff7abe28c3d43567fede94dd5389ef314fc06..2661eb81d14e744cf3204208ac21c2e0f43db005 100644
|
| --- a/remoting/protocol/webrtc_transport.cc
|
| +++ b/remoting/protocol/webrtc_transport.cc
|
| @@ -146,11 +146,7 @@ WebrtcTransport::WebrtcTransport(
|
| transport_context_(transport_context),
|
| event_handler_(event_handler),
|
| handshake_hmac_(crypto::HMAC::SHA256),
|
| - outgoing_data_stream_adapter_(
|
| - true,
|
| - base::Bind(&WebrtcTransport::Close, base::Unretained(this))),
|
| - incoming_data_stream_adapter_(
|
| - false,
|
| + data_stream_adapter_(
|
| base::Bind(&WebrtcTransport::Close, base::Unretained(this))),
|
| weak_factory_(this) {
|
| transport_context_->set_relay_mode(TransportContext::RelayMode::TURN);
|
| @@ -198,8 +194,7 @@ void WebrtcTransport::Start(
|
| peer_connection_ = peer_connection_factory_->CreatePeerConnection(
|
| rtc_config, &constraints, std::move(port_allocator), nullptr, this);
|
|
|
| - outgoing_data_stream_adapter_.Initialize(peer_connection_);
|
| - incoming_data_stream_adapter_.Initialize(peer_connection_);
|
| + data_stream_adapter_.Initialize(peer_connection_);
|
|
|
| event_handler_->OnWebrtcTransportConnecting();
|
|
|
| @@ -439,7 +434,10 @@ void WebrtcTransport::OnRemoveStream(
|
| void WebrtcTransport::OnDataChannel(
|
| rtc::scoped_refptr<webrtc::DataChannelInterface> data_channel) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - incoming_data_stream_adapter_.OnIncomingDataChannel(data_channel);
|
| + data_stream_adapter_.WrapIncomingDataChannel(
|
| + data_channel,
|
| + base::Bind(&EventHandler::OnWebrtcTransportIncomingDataChannel,
|
| + base::Unretained(event_handler_), data_channel->label()));
|
| }
|
|
|
| void WebrtcTransport::OnRenegotiationNeeded() {
|
|
|