Refactoring on QUIC related classes.
Merge with the latest webrtc native code.
Remove deprecated function Connect() in QuicTransportChannel.
Fix the compiling issue and broken unit tests by adding the network thread to QUIC related classes.
Review-Url: https://codereview.webrtc.org/2089553002
Cr-Commit-Position: refs/heads/master@{#13472}
diff --git a/webrtc/api/quicdatachannel_unittest.cc b/webrtc/api/quicdatachannel_unittest.cc
index e701c29..7245ccf 100644
--- a/webrtc/api/quicdatachannel_unittest.cc
+++ b/webrtc/api/quicdatachannel_unittest.cc
@@ -120,8 +120,9 @@
DataChannelInit config;
config.id = id;
config.protocol = protocol;
- rtc::scoped_refptr<QuicDataChannel> data_channel(new QuicDataChannel(
- rtc::Thread::Current(), rtc::Thread::Current(), label, config));
+ rtc::scoped_refptr<QuicDataChannel> data_channel(
+ new QuicDataChannel(rtc::Thread::Current(), rtc::Thread::Current(),
+ rtc::Thread::Current(), label, config));
data_channel_by_id_[id] = data_channel;
return data_channel;
}
@@ -201,8 +202,6 @@
// Connects |ice_transport_channel_| to that of the other peer.
void Connect(QuicDataChannelPeer* other_peer) {
- ice_transport_channel_->Connect();
- other_peer->ice_transport_channel_->Connect();
ice_transport_channel_->SetDestination(other_peer->ice_transport_channel_);
}