From 8d6cd55b60176da8f975da9f4ee1143e01a09db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 22 Dec 2021 15:44:54 +0100 Subject: [PATCH] Refactor CallStats2Test to not use ProcessThread. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I93bed50d03c2b15c03f57b6db6dd34a038e1ba58 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/242369 Auto-Submit: Niels Moller Commit-Queue: Niels Moller Reviewed-by: Erik Språng Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/main@{#35571} --- video/BUILD.gn | 1 - video/call_stats2_unittest.cc | 20 ++++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/video/BUILD.gn b/video/BUILD.gn index 82a653a508..a7a19b9f95 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -726,7 +726,6 @@ if (rtc_include_tests) { "../modules/rtp_rtcp", "../modules/rtp_rtcp:mock_rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp_format", - "../modules/utility", "../modules/video_coding", "../modules/video_coding:codec_globals_headers", "../modules/video_coding:encoded_frame", diff --git a/video/call_stats2_unittest.cc b/video/call_stats2_unittest.cc index 65264926e4..4f371e85a9 100644 --- a/video/call_stats2_unittest.cc +++ b/video/call_stats2_unittest.cc @@ -12,8 +12,8 @@ #include +#include "api/task_queue/default_task_queue_factory.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/utility/include/process_thread.h" #include "rtc_base/task_utils/to_queued_task.h" #include "rtc_base/thread.h" #include "system_wrappers/include/metrics.h" @@ -38,31 +38,27 @@ class MockStatsObserver : public CallStatsObserver { class CallStats2Test : public ::testing::Test { public: - CallStats2Test() { - call_stats_.EnsureStarted(); - process_thread_->Start(); - } - - ~CallStats2Test() override { process_thread_->Stop(); } + CallStats2Test() { call_stats_.EnsureStarted(); } // Queues an rtt update call on the process thread. void AsyncSimulateRttUpdate(int64_t rtt) { RtcpRttStats* rtcp_rtt_stats = call_stats_.AsRtcpRttStats(); - process_thread_->PostTask(ToQueuedTask( + task_queue_.PostTask(ToQueuedTask( [rtcp_rtt_stats, rtt] { rtcp_rtt_stats->OnRttUpdate(rtt); })); } protected: void FlushProcessAndWorker() { - process_thread_->PostTask( + task_queue_.PostTask( ToQueuedTask([this] { loop_.PostTask([this]() { loop_.Quit(); }); })); loop_.Run(); } test::RunLoop loop_; - // TODO(nisse): Don't use process thread. - std::unique_ptr process_thread_{ - ProcessThread::Create("CallStats")}; + rtc::TaskQueue task_queue_{CreateDefaultTaskQueueFactory()->CreateTaskQueue( + "CallStats", + TaskQueueFactory::Priority::NORMAL)}; + // Note: Since rtc::Thread doesn't support injecting a Clock, we're going // to be using a mix of the fake clock (used by CallStats) as well as the // system clock (used by rtc::Thread). This isn't ideal and will result in