diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 5ef5845940..91a544c506 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -2954,15 +2954,13 @@ TEST_F(EndToEndTest, MAYBE_ContentTypeSwitches) { int num_frames_received_ GUARDED_BY(&crit_); } test; - test::ScopedFieldTrials override_field_trials( - "WebRTC-VideoContentTypeExtension/Enabled/"); metrics::Reset(); Call::Config send_config(test.GetSenderCallConfig()); Call::Config recv_config(test.GetReceiverCallConfig()); VideoEncoderConfig encoder_config_with_screenshare; - task_queue_.SendTask([this, &test, &override_field_trials, &send_config, + task_queue_.SendTask([this, &test, &send_config, &recv_config, &encoder_config_with_screenshare]() { CreateSenderCall(send_config); CreateReceiverCall(recv_config); @@ -3056,8 +3054,6 @@ TEST_F(EndToEndTest, VerifyHistogramStatsWithScreenshare) { const bool kEnabledRtx = false; const bool kEnabledRed = false; const bool kScreenshare = true; - test::ScopedFieldTrials override_field_trials( - "WebRTC-VideoContentTypeExtension/Enabled/"); VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare); } diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index e1afdf0fc2..4b75f95e06 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -740,10 +740,6 @@ VideoSendStreamImpl::VideoSendStreamImpl( RTC_DCHECK_GE(id, 1); RTC_DCHECK_LE(id, 14); RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); - if (StringToRtpExtensionType(extension) == kRtpExtensionVideoContentType && - !field_trial::IsEnabled("WebRTC-VideoContentTypeExtension")) { - continue; - } for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { RTC_CHECK_EQ(0, rtp_rtcp->RegisterSendRtpHeaderExtension( StringToRtpExtensionType(extension), id)); diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 9db0b65b41..194493715e 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -340,8 +340,6 @@ TEST_F(VideoSendStreamTest, SupportsVideoContentType) { } } test; - test::ScopedFieldTrials override_field_trials( - "WebRTC-VideoContentTypeExtension/Enabled/"); RunBaseTest(&test); }