From dea0a0c338892740d09986b394fa3c963640f8a9 Mon Sep 17 00:00:00 2001 From: Bjorn Mellem Date: Fri, 7 Jun 2019 06:15:34 +0000 Subject: [PATCH] Revert "Remove another DCHECK that fails during renegotiation." This reverts commit 907b5920912dcec98e677621cd65efefb9dc0eab. Reason for revert: Original change's description: > Remove another DCHECK that fails during renegotiation. > > Also adds a test case that catches both this DCHECK and the previous > one. > > Bug: webrtc:9719 > Change-Id: I590544a13cd178274e9c11b698c4694fd5cf0d59 > No-Try: True > Tbr: steveanton@webrtc.org > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140802 > Reviewed-by: Bjorn Mellem > Commit-Queue: Bjorn Mellem > Cr-Commit-Position: refs/heads/master@{#28185} TBR=steveanton@webrtc.org,mellem@webrtc.org,sukhanov@webrtc.org Change-Id: I2f01f720ffe6b9a3d5dd412b607f4e31e8cb1f97 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9719 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140823 Reviewed-by: Bjorn Mellem Commit-Queue: Bjorn Mellem Cr-Commit-Position: refs/heads/master@{#28186} --- pc/composite_rtp_transport.cc | 2 ++ pc/jsep_transport_controller_unittest.cc | 45 ------------------------ 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/pc/composite_rtp_transport.cc b/pc/composite_rtp_transport.cc index 61d9990d1d..bdeaacd116 100644 --- a/pc/composite_rtp_transport.cc +++ b/pc/composite_rtp_transport.cc @@ -73,6 +73,8 @@ void CompositeRtpTransport::RemoveTransport(RtpTransportInternal* transport) { auto it = absl::c_find(transports_, transport); if (it == transports_.end()) { + RTC_NOTREACHED() << "Callers should not remove transports they did not " + "include in the composite"; return; } diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc index 7b91ad8138..353a659712 100644 --- a/pc/jsep_transport_controller_unittest.cc +++ b/pc/jsep_transport_controller_unittest.cc @@ -2415,51 +2415,6 @@ TEST_P(JsepTransportControllerDatagramTest, RenegotiationCannotRemoveDatagram) { fake_params); } -TEST_P(JsepTransportControllerDatagramTest, - RenegotiationKeepsDatagramTransport) { - cricket::OpaqueTransportParameters fake_params = CreateTransportParameters(); - if (IsOfferer()) { - EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1), - fake_params); - EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1), - fake_params); - } - - auto offer = CreateSessionDescriptionForDatagramTransport(fake_params); - EXPECT_TRUE(SetDescription(SdpType::kOffer, offer.get()).ok()); - - EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1), - fake_params); - EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1), - fake_params); - - auto answer = CreateSessionDescriptionForDatagramTransport(fake_params); - EXPECT_TRUE(SetDescription(SdpType::kAnswer, answer.get()).ok()); - - EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1), - fake_params); - EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1), - fake_params); - - // Attempting to remove a datagram transport on a re-offer does not cause an - // error, but also does not remove the datagram transport. - auto reoffer = CreateSessionDescriptionForDatagramTransport(fake_params); - EXPECT_TRUE(SetDescription(SdpType::kOffer, reoffer.get()).ok()); - - EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1), - fake_params); - EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1), - fake_params); - - auto reanswer = CreateSessionDescriptionForDatagramTransport(fake_params); - EXPECT_TRUE(SetDescription(SdpType::kAnswer, reanswer.get()).ok()); - - EXPECT_EQ(transport_controller_->GetTransportParameters(kAudioMid1), - fake_params); - EXPECT_EQ(transport_controller_->GetTransportParameters(kVideoMid1), - fake_params); -} - INSTANTIATE_TEST_SUITE_P( JsepTransportControllerDatagramTests, JsepTransportControllerDatagramTest,