diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index a6c180f181..cd8e21742f 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -501,6 +501,7 @@ webrtc_fuzzer_test("audio_processing_fuzzer") { ":audio_processing_fuzzer_helper", "../../api:scoped_refptr", "../../api/audio:aec3_factory", + "../../api/task_queue:default_task_queue_factory", "../../modules/audio_processing", "../../modules/audio_processing:api", "../../modules/audio_processing:audio_buffer", @@ -509,7 +510,6 @@ webrtc_fuzzer_test("audio_processing_fuzzer") { "../../modules/audio_processing/aec_dump:aec_dump_impl", "../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_task_queue", - "../../rtc_base:rtc_task_queue_stdlib", "../../rtc_base:safe_minmax", "../../system_wrappers:field_trial", "//third_party/abseil-cpp/absl/memory", diff --git a/test/fuzzers/audio_processing_configs_fuzzer.cc b/test/fuzzers/audio_processing_configs_fuzzer.cc index f8e9ae5fa9..87d017c310 100644 --- a/test/fuzzers/audio_processing_configs_fuzzer.cc +++ b/test/fuzzers/audio_processing_configs_fuzzer.cc @@ -13,12 +13,12 @@ #include "absl/memory/memory.h" #include "api/audio/echo_canceller3_factory.h" +#include "api/task_queue/default_task_queue_factory.h" #include "modules/audio_processing/aec_dump/aec_dump_factory.h" #include "modules/audio_processing/include/audio_processing.h" #include "rtc_base/arraysize.h" #include "rtc_base/numerics/safe_minmax.h" #include "rtc_base/task_queue.h" -#include "rtc_base/task_queue_stdlib.h" #include "system_wrappers/include/field_trial.h" #include "test/fuzzers/audio_processing_fuzzer_helper.h" #include "test/fuzzers/fuzz_data_helper.h" @@ -151,14 +151,8 @@ std::unique_ptr CreateApm(test::FuzzDataHelper* fuzz_data, } TaskQueueFactory* GetTaskQueueFactory() { - // Chromium hijacked DefaultTaskQueueFactory with own implementation, but - // unable to use it without base::test::ScopedTaskEnvironment. Actual used - // task queue implementation shouldn't matter for the purpose of this fuzzer, - // so use stdlib implementation: that one is multiplatform. - // When bugs.webrtc.org/10284 is resolved and chromium stops hijacking - // DefaultTaskQueueFactory, Stdlib can be replaced with default one. static TaskQueueFactory* const factory = - CreateTaskQueueStdlibFactory().release(); + CreateDefaultTaskQueueFactory().release(); return factory; } diff --git a/test/fuzzers/utils/BUILD.gn b/test/fuzzers/utils/BUILD.gn index 009a3ff9cb..64bbb3e0bb 100644 --- a/test/fuzzers/utils/BUILD.gn +++ b/test/fuzzers/utils/BUILD.gn @@ -15,6 +15,7 @@ rtc_source_set("rtp_replayer") { "rtp_replayer.h", ] deps = [ + "../../../api/task_queue:default_task_queue_factory", "../../../api/test/video:function_video_factory", "../../../api/video_codecs:video_codecs_api", "../../../call", @@ -26,7 +27,6 @@ rtc_source_set("rtp_replayer") { "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base:rtc_json", - "../../../rtc_base:rtc_task_queue_stdlib", "../../../system_wrappers", "../../../test:call_config_utils", "../../../test:encoder_settings", diff --git a/test/fuzzers/utils/rtp_replayer.cc b/test/fuzzers/utils/rtp_replayer.cc index b62a822035..05abe1737c 100644 --- a/test/fuzzers/utils/rtp_replayer.cc +++ b/test/fuzzers/utils/rtp_replayer.cc @@ -15,9 +15,9 @@ #include #include "absl/memory/memory.h" +#include "api/task_queue/default_task_queue_factory.h" #include "modules/rtp_rtcp/include/rtp_header_parser.h" #include "rtc_base/strings/json.h" -#include "rtc_base/task_queue_stdlib.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/sleep.h" #include "test/call_config_utils.h" @@ -52,10 +52,8 @@ void RtpReplayer::Replay( // Setup the video streams based on the configuration. webrtc::RtcEventLogNullImpl event_log; - // TODO(bugs.webrtc.org/10284): Replace with DefaultTaskQueueFactory when - // chromium stops hijacking it. std::unique_ptr task_queue_factory = - CreateTaskQueueStdlibFactory(); + CreateDefaultTaskQueueFactory(); Call::Config call_config(&event_log); call_config.task_queue_factory = task_queue_factory.get(); std::unique_ptr call(Call::Create(call_config));