diff --git a/api/create_peerconnection_factory.cc b/api/create_peerconnection_factory.cc index 5d3aace05f..bd77f74882 100644 --- a/api/create_peerconnection_factory.cc +++ b/api/create_peerconnection_factory.cc @@ -48,8 +48,7 @@ rtc::scoped_refptr CreatePeerConnectionFactory( dependencies.signaling_thread = signaling_thread; dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(field_trials.get()); - dependencies.event_log_factory = std::make_unique( - dependencies.task_queue_factory.get()); + dependencies.event_log_factory = std::make_unique(); dependencies.trials = std::move(field_trials); if (network_thread) { diff --git a/api/rtc_event_log/rtc_event_log_factory.h b/api/rtc_event_log/rtc_event_log_factory.h index 21a670e1a7..1deb0612bf 100644 --- a/api/rtc_event_log/rtc_event_log_factory.h +++ b/api/rtc_event_log/rtc_event_log_factory.h @@ -26,10 +26,9 @@ class RTC_EXPORT RtcEventLogFactory : public RtcEventLogFactoryInterface { public: RtcEventLogFactory() = default; - // TODO(bugs.webrtc.org/15656): deprecate and delete constructor taking - // task queue factory in favor of using task queue factory provided through - // the Environment parameter in Create function. + [[deprecated("Use default constructor")]] // explicit RtcEventLogFactory(TaskQueueFactory* task_queue_factory) {} + ~RtcEventLogFactory() override = default; absl::Nonnull> Create( diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc index 40af78cdac..0e895c520b 100644 --- a/examples/androidnativeapi/jni/android_call_client.cc +++ b/examples/androidnativeapi/jni/android_call_client.cc @@ -154,8 +154,7 @@ void AndroidCallClient::CreatePeerConnectionFactory() { pcf_deps.worker_thread = worker_thread_.get(); pcf_deps.signaling_thread = signaling_thread_.get(); pcf_deps.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory(); - pcf_deps.event_log_factory = std::make_unique( - pcf_deps.task_queue_factory.get()); + pcf_deps.event_log_factory = std::make_unique(); pcf_deps.video_encoder_factory = std::make_unique(); diff --git a/examples/objcnativeapi/objc/objc_call_client.mm b/examples/objcnativeapi/objc/objc_call_client.mm index 996c6a9c7f..2601beed71 100644 --- a/examples/objcnativeapi/objc/objc_call_client.mm +++ b/examples/objcnativeapi/objc/objc_call_client.mm @@ -126,8 +126,7 @@ void ObjCCallClient::CreatePeerConnectionFactory() { [[RTC_OBJC_TYPE(RTCDefaultVideoDecoderFactory) alloc] init]); dependencies.audio_processing = webrtc::AudioProcessingBuilder().Create(); webrtc::EnableMedia(dependencies); - dependencies.event_log_factory = - std::make_unique(dependencies.task_queue_factory.get()); + dependencies.event_log_factory = std::make_unique(); pcf_ = webrtc::CreateModularPeerConnectionFactory(std::move(dependencies)); RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << pcf_.get(); } diff --git a/pc/peer_connection_header_extension_unittest.cc b/pc/peer_connection_header_extension_unittest.cc index 277979b330..15b1ae6d1c 100644 --- a/pc/peer_connection_header_extension_unittest.cc +++ b/pc/peer_connection_header_extension_unittest.cc @@ -90,8 +90,7 @@ class PeerConnectionHeaderExtensionTest EnableFakeMedia(factory_dependencies, std::move(media_engine)); factory_dependencies.event_log_factory = - std::make_unique( - factory_dependencies.task_queue_factory.get()); + std::make_unique(); auto pc_factory = CreateModularPeerConnectionFactory(std::move(factory_dependencies)); diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc index 5ee9881b84..a1cd4b663c 100644 --- a/pc/peer_connection_interface_unittest.cc +++ b/pc/peer_connection_interface_unittest.cc @@ -641,8 +641,7 @@ class PeerConnectionFactoryForTest : public PeerConnectionFactory { // level, and using a real one could make tests flaky when run in parallel. dependencies.adm = FakeAudioCaptureModule::Create(); EnableMediaWithDefaults(dependencies); - dependencies.event_log_factory = std::make_unique( - dependencies.task_queue_factory.get()); + dependencies.event_log_factory = std::make_unique(); return rtc::make_ref_counted( std::move(dependencies)); diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc index 387094cc4f..061c59a3b0 100644 --- a/pc/peer_connection_media_unittest.cc +++ b/pc/peer_connection_media_unittest.cc @@ -175,8 +175,7 @@ class PeerConnectionMediaBaseTest : public ::testing::Test { factory_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); EnableFakeMedia(factory_dependencies, std::move(media_engine)); factory_dependencies.event_log_factory = - std::make_unique( - factory_dependencies.task_queue_factory.get()); + std::make_unique(); auto pc_factory = CreateModularPeerConnectionFactory(std::move(factory_dependencies)); diff --git a/pc/test/integration_test_helpers.h b/pc/test/integration_test_helpers.h index 03711fd0d7..a480bc2870 100644 --- a/pc/test/integration_test_helpers.h +++ b/pc/test/integration_test_helpers.h @@ -800,8 +800,7 @@ class PeerConnectionIntegrationWrapper : public PeerConnectionObserver, pc_factory_dependencies.event_log_factory = std::move(event_log_factory); } else { pc_factory_dependencies.event_log_factory = - std::make_unique( - pc_factory_dependencies.task_queue_factory.get()); + std::make_unique(); } peer_connection_factory_ = CreateModularPeerConnectionFactory(std::move(pc_factory_dependencies)); diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc index df97e768e6..1ed52bec1b 100644 --- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc +++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc @@ -50,8 +50,7 @@ rtc::scoped_refptr CreateTestPCF( pcf_deps.worker_thread = worker_thread; pcf_deps.signaling_thread = signaling_thread; pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); - pcf_deps.event_log_factory = - std::make_unique(pcf_deps.task_queue_factory.get()); + pcf_deps.event_log_factory = std::make_unique(); pcf_deps.adm = CreateJavaAudioDeviceModule(jni, GetAppContext(jni).obj()); pcf_deps.video_encoder_factory = diff --git a/sdk/android/src/jni/pc/peer_connection_factory.cc b/sdk/android/src/jni/pc/peer_connection_factory.cc index 4d2a41355c..9a21e10ede 100644 --- a/sdk/android/src/jni/pc/peer_connection_factory.cc +++ b/sdk/android/src/jni/pc/peer_connection_factory.cc @@ -269,8 +269,7 @@ ScopedJavaLocalRef CreatePeerConnectionFactoryForJava( dependencies.worker_thread = worker_thread.get(); dependencies.signaling_thread = signaling_thread.get(); dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); - dependencies.event_log_factory = std::make_unique( - dependencies.task_queue_factory.get()); + dependencies.event_log_factory = std::make_unique(); dependencies.fec_controller_factory = std::move(fec_controller_factory); dependencies.network_controller_factory = std::move(network_controller_factory); diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm index 15f9eb9ee4..445006f0d0 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm @@ -206,8 +206,7 @@ dependencies.audio_processing = webrtc::AudioProcessingBuilder().Create(); } webrtc::EnableMedia(dependencies); - dependencies.event_log_factory = - std::make_unique(dependencies.task_queue_factory.get()); + dependencies.event_log_factory = std::make_unique(); dependencies.network_controller_factory = std::move(networkControllerFactory); _nativeFactory = webrtc::CreateModularPeerConnectionFactory(std::move(dependencies)); NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!"); diff --git a/test/network/network_emulation_pc_unittest.cc b/test/network/network_emulation_pc_unittest.cc index 09d3946747..73ac54e7ef 100644 --- a/test/network/network_emulation_pc_unittest.cc +++ b/test/network/network_emulation_pc_unittest.cc @@ -56,8 +56,7 @@ rtc::scoped_refptr CreatePeerConnectionFactory( rtc::Thread* network_thread) { PeerConnectionFactoryDependencies pcf_deps; pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory(); - pcf_deps.event_log_factory = - std::make_unique(pcf_deps.task_queue_factory.get()); + pcf_deps.event_log_factory = std::make_unique(); pcf_deps.network_thread = network_thread; pcf_deps.signaling_thread = signaling_thread; pcf_deps.trials = std::make_unique(); diff --git a/test/pc/e2e/test_peer_factory.cc b/test/pc/e2e/test_peer_factory.cc index dd900027ee..940a4ff9fd 100644 --- a/test/pc/e2e/test_peer_factory.cc +++ b/test/pc/e2e/test_peer_factory.cc @@ -43,16 +43,14 @@ constexpr int kDefaultSamplingFrequencyInHz = 48000; // and `pc_dependencies` if they are omitted. Also setup required // dependencies, that won't be specially provided by factory and will be just // transferred to peer connection creation code. -void SetMandatoryEntities(InjectableComponents* components, - TimeController& time_controller) { +void SetMandatoryEntities(InjectableComponents* components) { RTC_DCHECK(components->pcf_dependencies); RTC_DCHECK(components->pc_dependencies); // Setup required peer connection factory dependencies. if (components->pcf_dependencies->event_log_factory == nullptr) { components->pcf_dependencies->event_log_factory = - std::make_unique( - time_controller.GetTaskQueueFactory()); + std::make_unique(); } if (!components->pcf_dependencies->trials) { components->pcf_dependencies->trials = @@ -286,7 +284,7 @@ std::unique_ptr TestPeerFactory::CreateTestPeer( RTC_DCHECK(configurable_params); RTC_DCHECK_EQ(configurable_params->video_configs.size(), video_sources.size()); - SetMandatoryEntities(components.get(), time_controller_); + SetMandatoryEntities(components.get()); params->rtc_configuration.sdp_semantics = SdpSemantics::kUnifiedPlan; // Create peer connection factory. diff --git a/test/peer_scenario/peer_scenario_client.cc b/test/peer_scenario/peer_scenario_client.cc index 60f2ea7f2e..1397b32fe3 100644 --- a/test/peer_scenario/peer_scenario_client.cc +++ b/test/peer_scenario/peer_scenario_client.cc @@ -248,8 +248,7 @@ PeerScenarioClient::PeerScenarioClient( pcf_deps.worker_thread = worker_thread_.get(); pcf_deps.task_queue_factory = net->time_controller()->CreateTaskQueueFactory(); - pcf_deps.event_log_factory = - std::make_unique(task_queue_factory_); + pcf_deps.event_log_factory = std::make_unique(); pcf_deps.trials = std::make_unique(); pcf_deps.adm = TestAudioDeviceModule::Create( diff --git a/webrtc_lib_link_test.cc b/webrtc_lib_link_test.cc index 64da01e4ef..e129ad55d2 100644 --- a/webrtc_lib_link_test.cc +++ b/webrtc_lib_link_test.cc @@ -57,8 +57,7 @@ webrtc::PeerConnectionFactoryDependencies CreateSomePcfDeps() { pcf_deps.signaling_thread = rtc::Thread::Current(); pcf_deps.network_thread = rtc::Thread::Current(); pcf_deps.worker_thread = rtc::Thread::Current(); - pcf_deps.event_log_factory = std::make_unique( - pcf_deps.task_queue_factory.get()); + pcf_deps.event_log_factory = std::make_unique(); CreateSomeMediaDeps(pcf_deps); EnableMedia(pcf_deps); return pcf_deps;