diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc index 25383e83e5..ed2dfca849 100644 --- a/pc/sdp_offer_answer.cc +++ b/pc/sdp_offer_answer.cc @@ -3619,11 +3619,7 @@ RTCError SdpOfferAnswerHandler::ValidateSessionDescription( // Validate that there are no collisions of bundled header extensions ids. error = ValidateBundledRtpHeaderExtensions(*sdesc->description()); - RTC_HISTOGRAM_BOOLEAN("WebRTC.PeerConnection.ValidBundledExtensionIds", - error.ok()); - // TODO(bugs.webrtc.org/14782): remove killswitch after rollout. - if (!error.ok() && !pc_->trials().IsDisabled( - "WebRTC-PreventBundleHeaderExtensionIdCollision")) { + if (!error.ok()) { return error; } diff --git a/pc/sdp_offer_answer_unittest.cc b/pc/sdp_offer_answer_unittest.cc index bbf7e2b092..2537a414b6 100644 --- a/pc/sdp_offer_answer_unittest.cc +++ b/pc/sdp_offer_answer_unittest.cc @@ -304,9 +304,6 @@ TEST_F(SdpOfferAnswerTest, BundleMeasuresHeaderExtensionIdCollision) { RTCError error; pc->SetRemoteDescription(std::move(desc), &error); EXPECT_TRUE(error.ok()); - EXPECT_METRIC_EQ(1, - webrtc::metrics::NumEvents( - "WebRTC.PeerConnection.ValidBundledExtensionIds", true)); } // extmap:3 is used with two different URIs which is not allowed. @@ -345,9 +342,6 @@ TEST_F(SdpOfferAnswerTest, BundleRejectsHeaderExtensionIdCollision) { pc->SetRemoteDescription(std::move(desc), &error); EXPECT_FALSE(error.ok()); EXPECT_EQ(error.type(), RTCErrorType::INVALID_PARAMETER); - EXPECT_METRIC_EQ( - 1, webrtc::metrics::NumEvents( - "WebRTC.PeerConnection.ValidBundledExtensionIds", false)); } // transport-wide cc is negotiated with two different ids 3 and 4. @@ -388,9 +382,6 @@ TEST_F(SdpOfferAnswerTest, BundleAcceptsDifferentIdsForSameExtension) { RTCError error; pc->SetRemoteDescription(std::move(desc), &error); EXPECT_TRUE(error.ok()); - EXPECT_METRIC_EQ(1, - webrtc::metrics::NumEvents( - "WebRTC.PeerConnection.ValidBundledExtensionIds", true)); } TEST_F(SdpOfferAnswerTest, LargeMidsAreRejected) {