diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h index 63751c341c..303671c12d 100644 --- a/api/test/peerconnection_quality_test_fixture.h +++ b/api/test/peerconnection_quality_test_fixture.h @@ -500,20 +500,8 @@ class PeerConnectionE2EQualityTestFixture { // `configurer` function will be used to configure peer in the call. virtual PeerHandle* AddPeer( const PeerNetworkDependencies& network_dependencies, - rtc::FunctionView configurer) { - return AddPeer(network_dependencies.network_thread, - network_dependencies.network_manager, configurer); - } - // TODO(bugs.webrtc.org/13145): Delete, replaced by above overload with - // PeerNetworkDependencies. - virtual PeerHandle* AddPeer( - rtc::Thread* network_thread, - rtc::NetworkManager* network_manager, - rtc::FunctionView configurer) { - return AddPeer({network_thread, network_manager, - /*packet_socket_factory=*/nullptr}, - configurer); - } + rtc::FunctionView configurer) = 0; + // Runs the media quality test, which includes setting up the call with // configured participants, running it according to provided `run_params` and // terminating it properly at the end. During call duration media quality diff --git a/test/pc/e2e/peer_configurer.h b/test/pc/e2e/peer_configurer.h index d96758e59c..41eeb29549 100644 --- a/test/pc/e2e/peer_configurer.h +++ b/test/pc/e2e/peer_configurer.h @@ -44,7 +44,7 @@ class PeerConfigurerImpl final PeerConfigurerImpl(rtc::Thread* network_thread, rtc::NetworkManager* network_manager, - rtc::PacketSocketFactory* packet_socket_factory = nullptr) + rtc::PacketSocketFactory* packet_socket_factory) : components_( std::make_unique(network_thread, network_manager, diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc index 4e9368fec9..4875658fb5 100644 --- a/test/pc/e2e/peer_connection_quality_test.cc +++ b/test/pc/e2e/peer_connection_quality_test.cc @@ -170,11 +170,11 @@ void PeerConnectionE2EQualityTest::AddQualityMetricsReporter( } PeerConnectionE2EQualityTest::PeerHandle* PeerConnectionE2EQualityTest::AddPeer( - rtc::Thread* network_thread, - rtc::NetworkManager* network_manager, + const PeerNetworkDependencies& network_dependencies, rtc::FunctionView configurer) { - peer_configurations_.push_back( - std::make_unique(network_thread, network_manager)); + peer_configurations_.push_back(std::make_unique( + network_dependencies.network_thread, network_dependencies.network_manager, + network_dependencies.packet_socket_factory)); configurer(peer_configurations_.back().get()); peer_handles_.push_back(PeerHandleImpl()); return &peer_handles_.back(); diff --git a/test/pc/e2e/peer_connection_quality_test.h b/test/pc/e2e/peer_connection_quality_test.h index 4426ee7553..a3f3e14ba6 100644 --- a/test/pc/e2e/peer_connection_quality_test.h +++ b/test/pc/e2e/peer_connection_quality_test.h @@ -69,8 +69,7 @@ class PeerConnectionE2EQualityTest quality_metrics_reporter) override; PeerHandle* AddPeer( - rtc::Thread* network_thread, - rtc::NetworkManager* network_manager, + const PeerNetworkDependencies& network_dependencies, rtc::FunctionView configurer) override; void Run(RunParams run_params) override; diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc index 5683de4072..c735f19101 100644 --- a/test/pc/e2e/test_peer_factory.cc +++ b/test/pc/e2e/test_peer_factory.cc @@ -261,7 +261,7 @@ PeerConnectionDependencies CreatePCDependencies( PeerConnectionDependencies pc_deps(observer); auto port_allocator = std::make_unique( - pc_dependencies->network_manager); + pc_dependencies->network_manager, pc_dependencies->packet_socket_factory); // This test does not support TCP int flags = cricket::PORTALLOCATOR_DISABLE_TCP;