zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop QuicDataChannel and QuicDataTransport unit tests from segfaulting

Browse Source 
Minor; needed because QuicTransportChannel now owns the ICE transport
channel as a result of the QuicTransport CL.

TBR=pthatcher@webrtc.org

BUG=

Review-Url: https://codereview.webrtc.org/1934723003
Cr-Commit-Position: refs/heads/master@{#12576}
This commit is contained in:
mikescarlett
2016-04-29 22:09:27 -07:00
committed by Commit bot
parent e7748674ee
commit a97611a43f
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/api/quicdatachannel_unittest.cc
View File

@ -167,9 +167,9 @@ class FakeQuicDataTransport : public sigslot::has_slots<> {
class QuicDataChannelPeer { class QuicDataChannelPeer {
public: public:
QuicDataChannelPeer() QuicDataChannelPeer()
: ice_transport_channel_("data", 0), : ice_transport_channel_(new FakeTransportChannel("data", 0)),
quic_transport_channel_(&ice_transport_channel_) { quic_transport_channel_(ice_transport_channel_) {
ice_transport_channel_.SetAsync(true); ice_transport_channel_->SetAsync(true);
fake_quic_data_transport_.ConnectToTransportChannel( fake_quic_data_transport_.ConnectToTransportChannel(
&quic_transport_channel_); &quic_transport_channel_);
} }
@ -201,9 +201,9 @@ class QuicDataChannelPeer {
// Connects |ice_transport_channel_| to that of the other peer. // Connects |ice_transport_channel_| to that of the other peer.
void Connect(QuicDataChannelPeer* other_peer) { void Connect(QuicDataChannelPeer* other_peer) {
ice_transport_channel_.Connect(); ice_transport_channel_->Connect();
other_peer->ice_transport_channel_.Connect(); other_peer->ice_transport_channel_->Connect();
ice_transport_channel_.SetDestination(&other_peer->ice_transport_channel_); ice_transport_channel_->SetDestination(other_peer->ice_transport_channel_);
} }
rtc::scoped_ptr<rtc::SSLFingerprint>& local_fingerprint() { rtc::scoped_ptr<rtc::SSLFingerprint>& local_fingerprint() {
@ -215,11 +215,11 @@ class QuicDataChannelPeer {
} }
FakeTransportChannel* ice_transport_channel() { FakeTransportChannel* ice_transport_channel() {
return &ice_transport_channel_; return ice_transport_channel_;
} }
private: private:
FakeTransportChannel ice_transport_channel_; FakeTransportChannel* ice_transport_channel_;
QuicTransportChannel quic_transport_channel_; QuicTransportChannel quic_transport_channel_;
rtc::scoped_ptr<rtc::SSLFingerprint> local_fingerprint_; rtc::scoped_ptr<rtc::SSLFingerprint> local_fingerprint_;

14
webrtc/api/quicdatatransport_unittest.cc
View File

@ -64,9 +64,9 @@ class QuicDataTransportPeer {
public: public:
QuicDataTransportPeer() QuicDataTransportPeer()
: quic_data_transport_(rtc::Thread::Current(), rtc::Thread::Current()), : quic_data_transport_(rtc::Thread::Current(), rtc::Thread::Current()),
ice_transport_channel_("data", 0), ice_transport_channel_(new FakeTransportChannel("data", 0)),
quic_transport_channel_(&ice_transport_channel_) { quic_transport_channel_(ice_transport_channel_) {
ice_transport_channel_.SetAsync(true); ice_transport_channel_->SetAsync(true);
} }
void GenerateCertificateAndFingerprint() { void GenerateCertificateAndFingerprint() {
@ -79,9 +79,9 @@ class QuicDataTransportPeer {
// Connects |ice_transport_channel_| to that of the other peer. // Connects |ice_transport_channel_| to that of the other peer.
void Connect(QuicDataTransportPeer* other_peer) { void Connect(QuicDataTransportPeer* other_peer) {
ice_transport_channel_.Connect(); ice_transport_channel_->Connect();
other_peer->ice_transport_channel_.Connect(); other_peer->ice_transport_channel_->Connect();
ice_transport_channel_.SetDestination(&other_peer->ice_transport_channel_); ice_transport_channel_->SetDestination(other_peer->ice_transport_channel_);
} }
rtc::scoped_ptr<rtc::SSLFingerprint>& local_fingerprint() { rtc::scoped_ptr<rtc::SSLFingerprint>& local_fingerprint() {
@ -122,7 +122,7 @@ class QuicDataTransportPeer {
} }
QuicDataTransport quic_data_transport_; QuicDataTransport quic_data_transport_;
FakeTransportChannel ice_transport_channel_; FakeTransportChannel* ice_transport_channel_;
QuicTransportChannel quic_transport_channel_; QuicTransportChannel quic_transport_channel_;
rtc::scoped_ptr<rtc::SSLFingerprint> local_fingerprint_; rtc::scoped_ptr<rtc::SSLFingerprint> local_fingerprint_;
}; };