From 02d9eceb3c25c4e013b966a23b1d262bd1a75f8e Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Mon, 15 Jan 2024 15:51:12 +0100
Subject: [PATCH] Remove dependency on rtc::TaskQueue in AudioProcessing module

Bug: webrtc:14169
Change-Id: I703cd01a6fd013ae4d5236bb76686aab4aa89381
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333960
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41551}
---
 modules/audio_processing/BUILD.gn                 |  1 -
 modules/audio_processing/aec_dump/BUILD.gn        |  1 -
 .../audio_processing/aec_dump/aec_dump_factory.h  | 10 ----------
 .../audio_processing/include/audio_processing.cc  | 15 ---------------
 .../audio_processing/include/audio_processing.h   | 12 ------------
 5 files changed, 39 deletions(-)

diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 35193c18fe..817a3515b0 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -37,7 +37,6 @@ rtc_library("api") {
     "../../api/task_queue",
     "../../rtc_base:macromagic",
     "../../rtc_base:refcount",
-    "../../rtc_base:rtc_task_queue",
     "../../rtc_base:stringutils",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
diff --git a/modules/audio_processing/aec_dump/BUILD.gn b/modules/audio_processing/aec_dump/BUILD.gn
index ffbc098ed4..5193e28dff 100644
--- a/modules/audio_processing/aec_dump/BUILD.gn
+++ b/modules/audio_processing/aec_dump/BUILD.gn
@@ -15,7 +15,6 @@ rtc_source_set("aec_dump") {
   deps = [
     "..:aec_dump_interface",
     "../../../api/task_queue",
-    "../../../rtc_base:rtc_task_queue",
     "../../../rtc_base/system:file_wrapper",
     "../../../rtc_base/system:rtc_export",
   ]
diff --git a/modules/audio_processing/aec_dump/aec_dump_factory.h b/modules/audio_processing/aec_dump/aec_dump_factory.h
index c76e9739ea..0d258a9ebc 100644
--- a/modules/audio_processing/aec_dump/aec_dump_factory.h
+++ b/modules/audio_processing/aec_dump/aec_dump_factory.h
@@ -19,7 +19,6 @@
 #include "modules/audio_processing/include/aec_dump.h"
 #include "rtc_base/system/file_wrapper.h"
 #include "rtc_base/system/rtc_export.h"
-#include "rtc_base/task_queue.h"
 
 namespace webrtc {
 
@@ -42,15 +41,6 @@ class RTC_EXPORT AecDumpFactory {
       absl::Nonnull<FILE*> handle,
       int64_t max_log_size_bytes,
       absl::Nonnull<TaskQueueBase*> worker_queue);
-
-  // TODO: bugs.webrtc.org/14169 - Delete this variant when no longer used by
-  // chromium.
-  static absl::Nullable<std::unique_ptr<AecDump>> Create(
-      absl::Nonnull<FILE*> handle,
-      int64_t max_log_size_bytes,
-      absl::Nonnull<rtc::TaskQueue*> worker_queue) {
-    return Create(handle, max_log_size_bytes, worker_queue->Get());
-  }
 };
 
 }  // namespace webrtc
diff --git a/modules/audio_processing/include/audio_processing.cc b/modules/audio_processing/include/audio_processing.cc
index c6c84a0eb0..13ddcc588a 100644
--- a/modules/audio_processing/include/audio_processing.cc
+++ b/modules/audio_processing/include/audio_processing.cc
@@ -12,7 +12,6 @@
 
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/arch.h"
-#include "rtc_base/task_queue.h"
 
 namespace webrtc {
 namespace {
@@ -208,18 +207,4 @@ std::string AudioProcessing::Config::ToString() const {
   return builder.str();
 }
 
-bool AudioProcessing::CreateAndAttachAecDump(absl::string_view file_name,
-                                             int64_t max_log_size_bytes,
-                                             rtc::TaskQueue* worker_queue) {
-  return CreateAndAttachAecDump(file_name, max_log_size_bytes,
-                                worker_queue->Get());
-}
-
-bool AudioProcessing::CreateAndAttachAecDump(FILE* handle,
-                                             int64_t max_log_size_bytes,
-                                             rtc::TaskQueue* worker_queue) {
-  return CreateAndAttachAecDump(handle, max_log_size_bytes,
-                                worker_queue->Get());
-}
-
 }  // namespace webrtc
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 578aded739..dd484be4f1 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -37,10 +37,6 @@
 #include "rtc_base/system/file_wrapper.h"
 #include "rtc_base/system/rtc_export.h"
 
-namespace rtc {
-class TaskQueue;
-}  // namespace rtc
-
 namespace webrtc {
 
 class AecDump;
@@ -634,14 +630,6 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface {
   // return value of true indicates that the file has been
   // sucessfully opened, while a value of false indicates that
   // opening the file failed.
-  // TODO: bugs.webrtc.org/14169 - Delete rtc::TaskQueue variants
-  [[deprecated]] bool CreateAndAttachAecDump(absl::string_view file_name,
-                                             int64_t max_log_size_bytes,
-                                             rtc::TaskQueue* worker_queue);
-  [[deprecated]] bool CreateAndAttachAecDump(FILE* handle,
-                                             int64_t max_log_size_bytes,
-                                             rtc::TaskQueue* worker_queue);
-
   virtual bool CreateAndAttachAecDump(
       absl::string_view file_name,
       int64_t max_log_size_bytes,