commit 745641e589aae09747d6b3df08475c6b54194c09
author Philipp Hancke <phancke@microsoft.com> Tue Aug 22 14:05:38 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 15 12:27:22 2023
tree ea8f8d65edd27c205c9293835d267fa1d5be9195
parent ad12dc52b7097bb929be023b7031d79752b9262a

sdp: remove WebRTC-PreventBundleHeaderExtensionIdCollision killswitch

and the associated UMA metrics after rollout in M116 stable.

BUG=webrtc:14782

Change-Id: Ib2e0f96e8aa0c1ffbf48aea30f93195aa8b44bb0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/317280
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40754}

pc/sdp_offer_answer.cc

diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc
index 25383e8..ed2dfca 100644
--- a/pc/sdp_offer_answer.cc
+++ b/pc/sdp_offer_answer.cc
@@ -3619,11 +3619,7 @@
 
   // 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;
   }
 

pc/sdp_offer_answer_unittest.cc

diff --git a/pc/sdp_offer_answer_unittest.cc b/pc/sdp_offer_answer_unittest.cc
index bbf7e2b..2537a41 100644
--- a/pc/sdp_offer_answer_unittest.cc
+++ b/pc/sdp_offer_answer_unittest.cc
@@ -304,9 +304,6 @@
   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 @@
   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 @@
   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) {