From 7ee45945dab5a3c65cd2a93530e6d00462068d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 5 May 2022 09:30:35 +0200 Subject: [PATCH] Use callback version of AddIceCandidate in PC tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11798 Change-Id: I50919e744d24b47ffac8ba294e18a31dfa053a50 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261245 Commit-Queue: Niels Moller Reviewed-by: Henrik Boström Cr-Commit-Position: refs/heads/main@{#36835} --- pc/test/integration_test_helpers.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pc/test/integration_test_helpers.h b/pc/test/integration_test_helpers.h index 24d4616577..f408e0cd15 100644 --- a/pc/test/integration_test_helpers.h +++ b/pc/test/integration_test_helpers.h @@ -27,6 +27,7 @@ #include #include "absl/algorithm/container.h" +#include "absl/memory/memory.h" #include "absl/types/optional.h" #include "api/audio_options.h" #include "api/call/call_factory_interface.h" @@ -1045,9 +1046,12 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, int sdp_mline_index, const std::string& msg) override { RTC_LOG(LS_INFO) << debug_name_ << ": ReceiveIceMessage"; - std::unique_ptr candidate( - webrtc::CreateIceCandidate(sdp_mid, sdp_mline_index, msg, nullptr)); - EXPECT_TRUE(pc()->AddIceCandidate(candidate.get())); + absl::optional result; + pc()->AddIceCandidate(absl::WrapUnique(webrtc::CreateIceCandidate( + sdp_mid, sdp_mline_index, msg, nullptr)), + [&result](RTCError r) { result = r; }); + EXPECT_TRUE_WAIT(result.has_value(), kDefaultTimeout); + EXPECT_TRUE(result.value().ok()); } // PeerConnectionObserver callbacks.