diff --git a/api/DEPS b/api/DEPS index 3a650b6253..5a5c285856 100644 --- a/api/DEPS +++ b/api/DEPS @@ -159,13 +159,6 @@ specific_include_rules = { "+modules/audio_processing/include/audio_processing.h", ], - "fake_metronome\.h": [ - "+rtc_base/synchronization/mutex.h", - "+rtc_base/task_queue.h", - "+rtc_base/task_utils/repeating_task.h", - "+rtc_base/thread_annotations.h", - ], - "make_ref_counted\.h": [ "+rtc_base/ref_counted_object.h", ], diff --git a/api/metronome/BUILD.gn b/api/metronome/BUILD.gn index 3d3d876df0..f879d5f2fb 100644 --- a/api/metronome/BUILD.gn +++ b/api/metronome/BUILD.gn @@ -13,7 +13,7 @@ rtc_source_set("metronome") { sources = [ "metronome.h" ] deps = [ "../../rtc_base/system:rtc_export", - "../task_queue", "../units:time_delta", ] + absl_deps = [ "//third_party/abseil-cpp/absl/functional:any_invocable" ] } diff --git a/api/metronome/metronome.h b/api/metronome/metronome.h index a312b1c862..4d50a3ecd0 100644 --- a/api/metronome/metronome.h +++ b/api/metronome/metronome.h @@ -11,7 +11,7 @@ #ifndef API_METRONOME_METRONOME_H_ #define API_METRONOME_METRONOME_H_ -#include "api/task_queue/task_queue_base.h" +#include "absl/functional/any_invocable.h" #include "api/units/time_delta.h" #include "rtc_base/system/rtc_export.h" diff --git a/api/metronome/test/BUILD.gn b/api/metronome/test/BUILD.gn index f415d98a0b..94ecf9f727 100644 --- a/api/metronome/test/BUILD.gn +++ b/api/metronome/test/BUILD.gn @@ -16,15 +16,8 @@ rtc_library("fake_metronome") { ] deps = [ "..:metronome", - "../..:priority", - "../..:sequence_checker", - "../../../rtc_base:macromagic", - "../../../rtc_base:rtc_event", - "../../../rtc_base:rtc_task_queue", - "../../../rtc_base/synchronization:mutex", - "../../../rtc_base/task_utils:repeating_task", - "../../../test:test_support", "../../task_queue", "../../units:time_delta", ] + absl_deps = [ "//third_party/abseil-cpp/absl/functional:any_invocable" ] } diff --git a/api/metronome/test/fake_metronome.cc b/api/metronome/test/fake_metronome.cc index 37001fe4a1..bd54d5b0ba 100644 --- a/api/metronome/test/fake_metronome.cc +++ b/api/metronome/test/fake_metronome.cc @@ -13,13 +13,9 @@ #include #include -#include "api/priority.h" -#include "api/sequence_checker.h" +#include "absl/functional/any_invocable.h" #include "api/task_queue/task_queue_base.h" -#include "api/task_queue/task_queue_factory.h" #include "api/units/time_delta.h" -#include "rtc_base/event.h" -#include "rtc_base/task_utils/repeating_task.h" namespace webrtc::test { diff --git a/api/metronome/test/fake_metronome.h b/api/metronome/test/fake_metronome.h index e1aff4f4c0..9702062cf6 100644 --- a/api/metronome/test/fake_metronome.h +++ b/api/metronome/test/fake_metronome.h @@ -11,18 +11,12 @@ #ifndef API_METRONOME_TEST_FAKE_METRONOME_H_ #define API_METRONOME_TEST_FAKE_METRONOME_H_ -#include -#include +#include #include +#include "absl/functional/any_invocable.h" #include "api/metronome/metronome.h" -#include "api/task_queue/task_queue_base.h" -#include "api/task_queue/task_queue_factory.h" #include "api/units/time_delta.h" -#include "rtc_base/synchronization/mutex.h" -#include "rtc_base/task_queue.h" -#include "rtc_base/task_utils/repeating_task.h" -#include "rtc_base/thread_annotations.h" namespace webrtc::test { @@ -48,9 +42,6 @@ class ForcedTickMetronome : public Metronome { // FakeMetronome is a metronome that ticks based on a repeating task at the // `tick_period` provided in the constructor. It is designed for use with // simulated task queues for unit tests. -// -// `Stop()` must be called before destruction, as it cancels the metronome tick -// on the proper task queue. class FakeMetronome : public Metronome { public: explicit FakeMetronome(TimeDelta tick_period);