diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc')
-rw-r--r-- | third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc b/third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc index b1c6c3cfb5..277979b330 100644 --- a/third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc +++ b/third_party/libwebrtc/pc/peer_connection_header_extension_unittest.cc @@ -16,7 +16,6 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include "api/call/call_factory_interface.h" #include "api/jsep.h" #include "api/media_types.h" #include "api/peer_connection_interface.h" @@ -35,6 +34,7 @@ #include "p2p/base/port_allocator.h" #include "pc/peer_connection_wrapper.h" #include "pc/session_description.h" +#include "pc/test/enable_fake_media.h" #include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/internal/default_socket_server.h" #include "rtc_base/rtc_certificate_generator.h" @@ -77,21 +77,18 @@ class PeerConnectionHeaderExtensionTest std::unique_ptr<PeerConnectionWrapper> CreatePeerConnection( cricket::MediaType media_type, absl::optional<SdpSemantics> semantics) { - auto voice = std::make_unique<cricket::FakeVoiceEngine>(); - auto video = std::make_unique<cricket::FakeVideoEngine>(); + auto media_engine = std::make_unique<cricket::FakeMediaEngine>(); if (media_type == cricket::MediaType::MEDIA_TYPE_AUDIO) - voice->SetRtpHeaderExtensions(extensions_); + media_engine->fake_voice_engine()->SetRtpHeaderExtensions(extensions_); else - video->SetRtpHeaderExtensions(extensions_); - auto media_engine = std::make_unique<cricket::CompositeMediaEngine>( - std::move(voice), std::move(video)); + media_engine->fake_video_engine()->SetRtpHeaderExtensions(extensions_); PeerConnectionFactoryDependencies factory_dependencies; factory_dependencies.network_thread = rtc::Thread::Current(); factory_dependencies.worker_thread = rtc::Thread::Current(); factory_dependencies.signaling_thread = rtc::Thread::Current(); factory_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); - factory_dependencies.media_engine = std::move(media_engine); - factory_dependencies.call_factory = CreateCallFactory(); + EnableFakeMedia(factory_dependencies, std::move(media_engine)); + factory_dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>( factory_dependencies.task_queue_factory.get()); @@ -117,7 +114,7 @@ class PeerConnectionHeaderExtensionTest pc_factory, result.MoveValue(), std::move(observer)); } - webrtc::test::ScopedKeyValueConfig field_trials_; + test::ScopedKeyValueConfig field_trials_; std::unique_ptr<rtc::SocketServer> socket_server_; rtc::AutoSocketServerThread main_thread_; std::vector<RtpHeaderExtensionCapability> extensions_; |