From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/pc/peer_connection_jsep_unittest.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'third_party/libwebrtc/pc/peer_connection_jsep_unittest.cc') diff --git a/third_party/libwebrtc/pc/peer_connection_jsep_unittest.cc b/third_party/libwebrtc/pc/peer_connection_jsep_unittest.cc index 1369253ad6..786b519a93 100644 --- a/third_party/libwebrtc/pc/peer_connection_jsep_unittest.cc +++ b/third_party/libwebrtc/pc/peer_connection_jsep_unittest.cc @@ -20,7 +20,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "api/call/call_factory_interface.h" +#include "api/enable_media_with_defaults.h" #include "api/field_trials_view.h" #include "api/jsep.h" #include "api/media_stream_interface.h" @@ -40,7 +40,6 @@ #include "media/base/media_engine.h" #include "media/base/stream_params.h" #include "media/engine/webrtc_media_engine.h" -#include "media/engine/webrtc_media_engine_defaults.h" #include "modules/audio_device/include/audio_device.h" #include "p2p/base/p2p_constants.h" #include "p2p/base/port_allocator.h" @@ -84,13 +83,8 @@ PeerConnectionFactoryDependencies CreatePeerConnectionFactoryDependencies() { dependencies.signaling_thread = rtc::Thread::Current(); dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); dependencies.trials = std::make_unique(); - cricket::MediaEngineDependencies media_deps; - media_deps.task_queue_factory = dependencies.task_queue_factory.get(); - media_deps.adm = FakeAudioCaptureModule::Create(); - media_deps.trials = dependencies.trials.get(); - SetMediaEngineDefaults(&media_deps); - dependencies.media_engine = cricket::CreateMediaEngine(std::move(media_deps)); - dependencies.call_factory = CreateCallFactory(); + dependencies.adm = FakeAudioCaptureModule::Create(); + EnableMediaWithDefaults(dependencies); dependencies.sctp_factory = std::make_unique(); return dependencies; } -- cgit v1.2.3