From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/pc/connection_context.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'third_party/libwebrtc/pc/connection_context.cc') diff --git a/third_party/libwebrtc/pc/connection_context.cc b/third_party/libwebrtc/pc/connection_context.cc index df4522bf13..56a6e91869 100644 --- a/third_party/libwebrtc/pc/connection_context.cc +++ b/third_party/libwebrtc/pc/connection_context.cc @@ -15,7 +15,6 @@ #include #include "api/environment/environment.h" -#include "api/transport/field_trial_based_config.h" #include "media/base/media_engine.h" #include "media/sctp/sctp_transport_factory.h" #include "pc/media_factory.h" @@ -63,8 +62,7 @@ rtc::Thread* MaybeWrapThread(rtc::Thread* signaling_thread, std::unique_ptr MaybeCreateSctpFactory( std::unique_ptr factory, - rtc::Thread* network_thread, - const FieldTrialsView& field_trials) { + rtc::Thread* network_thread) { if (factory) { return factory; } @@ -113,8 +111,7 @@ ConnectionContext::ConnectionContext( default_socket_factory_(std::move(dependencies->packet_socket_factory)), sctp_factory_( MaybeCreateSctpFactory(std::move(dependencies->sctp_factory), - network_thread(), - env_.field_trials())), + network_thread())), use_rtx_(true) { RTC_DCHECK_RUN_ON(signaling_thread_); RTC_DCHECK(!(default_network_manager_ && network_monitor_factory_)) -- cgit v1.2.3