diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/pc/connection_context.cc | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | third_party/libwebrtc/pc/connection_context.cc | 7 |
1 files changed, 2 insertions, 5 deletions
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 <vector> #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<SctpTransportFactoryInterface> MaybeCreateSctpFactory( std::unique_ptr<SctpTransportFactoryInterface> 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_)) |