diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc index 66e2787e0c..38cef1e549 100644 --- a/pc/dtls_transport.cc +++ b/pc/dtls_transport.cc @@ -45,12 +45,12 @@ DtlsTransport::DtlsTransport( std::unique_ptr internal) : owner_thread_(rtc::Thread::Current()), info_(DtlsTransportState::kNew), - internal_dtls_transport_(std::move(internal)) { + internal_dtls_transport_(std::move(internal)), + ice_transport_(new rtc::RefCountedObject( + internal_dtls_transport_->ice_transport())) { RTC_DCHECK(internal_dtls_transport_.get()); internal_dtls_transport_->SignalDtlsState.connect( this, &DtlsTransport::OnInternalDtlsState); - ice_transport_ = new rtc::RefCountedObject( - internal_dtls_transport_->ice_transport()); UpdateInformation(); } @@ -77,8 +77,6 @@ void DtlsTransport::UnregisterObserver() { } rtc::scoped_refptr DtlsTransport::ice_transport() { - RTC_DCHECK_RUN_ON(owner_thread_); - rtc::CritScope scope(&lock_); return ice_transport_; } diff --git a/pc/dtls_transport.h b/pc/dtls_transport.h index 0251716b32..392532a43e 100644 --- a/pc/dtls_transport.h +++ b/pc/dtls_transport.h @@ -66,8 +66,7 @@ class DtlsTransport : public DtlsTransportInterface, DtlsTransportInformation info_ RTC_GUARDED_BY(lock_); std::unique_ptr internal_dtls_transport_ RTC_GUARDED_BY(lock_); - rtc::scoped_refptr ice_transport_ - RTC_GUARDED_BY(lock_); + const rtc::scoped_refptr ice_transport_; }; } // namespace webrtc