From d0dfe95bf082df7c38b24c8d20da91339f5199e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= <hbos@webrtc.org>
Date: Thu, 6 Apr 2023 11:52:02 +0200
Subject: [PATCH] Don't call EXPECT_TRUE_WAIT recursively.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In case this triggers unexpected error handling on ASAN.

Bug: webrtc:15018
Change-Id: Iec8154081f3831ee60902bb94900d79a98ea01fa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300480
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39779}
---
 pc/peer_connection_simulcast_unittest.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pc/peer_connection_simulcast_unittest.cc b/pc/peer_connection_simulcast_unittest.cc
index f975d370c7..f61d1e0687 100644
--- a/pc/peer_connection_simulcast_unittest.cc
+++ b/pc/peer_connection_simulcast_unittest.cc
@@ -986,7 +986,10 @@ class PeerConnectionSimulcastWithMediaFlowTests
       rtc::scoped_refptr<PeerConnectionTestWrapper> pc_wrapper) {
     auto callback = rtc::make_ref_counted<MockRTCStatsCollectorCallback>();
     pc_wrapper->pc()->GetStats(callback.get());
-    EXPECT_TRUE_WAIT(callback->called(), kDefaultTimeout.ms());
+    while (!callback->called()) {
+      rtc::Thread::Current()->ProcessMessages(0);
+      rtc::Thread::Current()->SleepMs(1);
+    }
     return callback->report();
   }