Reland "Don't create PacketSocketFactory inside BasicPortAllocatorSession" This is a reland of commit 7d4634cef76a1ac244d4b83faaf4c617bf236b71 Original change's description: > Don't create PacketSocketFactory inside BasicPortAllocatorSession > > This extends AlwaysValidPointer to avoid creating a unique_ptr inside it. > > Bug: webrtc:13145 > Change-Id: I73a4f18d0a7037b57f575b04b134e4f7eadceb79 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263240 > Reviewed-by: Jonas Oreland <jonaso@webrtc.org> > Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37048} Bug: webrtc:13145 Change-Id: Iec8091ada5862cb6aa48d45b2a426c05bda798f9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264826 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Owners-Override: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com> Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Christoffer Jansson <jansson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37138}
diff --git a/pc/test/integration_test_helpers.h b/pc/test/integration_test_helpers.h index e733bea..79737c6 100644 --- a/pc/test/integration_test_helpers.h +++ b/pc/test/integration_test_helpers.h
@@ -744,6 +744,7 @@ bool Init(const PeerConnectionFactory::Options* options, const PeerConnectionInterface::RTCConfiguration* config, webrtc::PeerConnectionDependencies dependencies, + rtc::SocketServer* socket_server, rtc::Thread* network_thread, rtc::Thread* worker_thread, std::unique_ptr<webrtc::FakeRtcEventLogFactory> event_log_factory, @@ -758,7 +759,9 @@ fake_network_manager_->AddInterface(kDefaultLocalAddress); std::unique_ptr<cricket::PortAllocator> port_allocator( - new cricket::BasicPortAllocator(fake_network_manager_.get())); + new cricket::BasicPortAllocator( + fake_network_manager_.get(), + std::make_unique<rtc::BasicPacketSocketFactory>(socket_server))); port_allocator_ = port_allocator.get(); fake_audio_capture_module_ = FakeAudioCaptureModule::Create(); if (!fake_audio_capture_module_) { @@ -1469,7 +1472,7 @@ new PeerConnectionIntegrationWrapper(debug_name)); if (!client->Init(options, &modified_config, std::move(dependencies), - network_thread_.get(), worker_thread_.get(), + fss_.get(), network_thread_.get(), worker_thread_.get(), std::move(event_log_factory), reset_encoder_factory, reset_decoder_factory, create_media_engine)) { return nullptr;