commit 7219105bae52692fcf3f547a26073a81f2b8cf5a parent 355b929932e7f5b87d3a95c6749e42f1c42c8f74 Author: Michael Froman <mfroman@mozilla.com> Date: Thu, 9 Oct 2025 23:39:41 -0500 Bug 1993083 - Vendor libwebrtc from 3b72aa4ac6 Upstream commit: https://webrtc.googlesource.com/src/+/3b72aa4ac6accf16c0fcddd129074536ae7b9e18 Remove use of Candidate::transport_name() from tests This helps with the process of deprecating the transport_name property. Bug: webrtc:42233526 Change-Id: I242a0d301f53b0f49360754022512325208da5e3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/402381 Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45224} Diffstat:
4 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:38:29.004329+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:39:31.935096+00:00. # base of lastest vendoring -749d311b9c +3b72aa4ac6 diff --git a/third_party/libwebrtc/pc/jsep_transport_controller_unittest.cc b/third_party/libwebrtc/pc/jsep_transport_controller_unittest.cc @@ -278,9 +278,8 @@ class JsepTransportControllerTest : public JsepTransportController::Observer, return config; } - Candidate CreateCandidate(const std::string& transport_name, int component) { + Candidate CreateCandidate(int component = ICE_CANDIDATE_COMPONENT_RTP) { Candidate c; - c.set_transport_name(transport_name); c.set_address(SocketAddress("192.168.1.1", 8000)); c.set_component(component); c.set_protocol(UDP_PROTOCOL_NAME); @@ -308,11 +307,9 @@ class JsepTransportControllerTest : public JsepTransportController::Observer, auto fake_video_dtls = static_cast<FakeDtlsTransport*>( transport_controller_->GetDtlsTransport(kVideoMid1)); fake_audio_dtls->fake_ice_transport()->SignalCandidateGathered( - fake_audio_dtls->fake_ice_transport(), - CreateCandidate(kAudioMid1, /*component=*/1)); + fake_audio_dtls->fake_ice_transport(), CreateCandidate()); fake_video_dtls->fake_ice_transport()->SignalCandidateGathered( - fake_video_dtls->fake_ice_transport(), - CreateCandidate(kVideoMid1, /*component=*/1)); + fake_video_dtls->fake_ice_transport(), CreateCandidate()); fake_audio_dtls->fake_ice_transport()->SetCandidatesGatheringComplete(); fake_video_dtls->fake_ice_transport()->SetCandidatesGatheringComplete(); fake_audio_dtls->fake_ice_transport()->SetConnectionCount(2); @@ -581,8 +578,7 @@ TEST_F(JsepTransportControllerTest, AddRemoveRemoteCandidates) { transport_controller_->GetDtlsTransport(kAudioMid1)); ASSERT_NE(nullptr, fake_audio_dtls); Candidates candidates; - candidates.push_back( - CreateCandidate(kAudioMid1, ICE_CANDIDATE_COMPONENT_RTP)); + candidates.push_back(CreateCandidate()); EXPECT_TRUE( transport_controller_->AddRemoteCandidates(kAudioMid1, candidates).ok()); EXPECT_EQ(1U, @@ -1123,7 +1119,7 @@ TEST_F(JsepTransportControllerTest, SignalCandidatesGathered) { auto fake_audio_dtls = static_cast<FakeDtlsTransport*>( transport_controller_->GetDtlsTransport(kAudioMid1)); fake_audio_dtls->fake_ice_transport()->SignalCandidateGathered( - fake_audio_dtls->fake_ice_transport(), CreateCandidate(kAudioMid1, 1)); + fake_audio_dtls->fake_ice_transport(), CreateCandidate()); EXPECT_THAT( WaitUntil([&] { return 1; }, ::testing::Eq(candidates_signal_count_), {.timeout = TimeDelta::Millis(kTimeout)}), diff --git a/third_party/libwebrtc/pc/peer_connection_bundle_unittest.cc b/third_party/libwebrtc/pc/peer_connection_bundle_unittest.cc @@ -111,7 +111,6 @@ class PeerConnectionWrapperForBundleTest : public PeerConnectionWrapper { for (size_t i = 0; i < desc->contents().size(); i++) { const auto& content = desc->contents()[i]; if (content.media_description()->type() == media_type) { - candidate->set_transport_name(content.mid()); std::unique_ptr<IceCandidate> jsep_candidate = CreateIceCandidate(content.mid(), i, *candidate); return pc()->AddIceCandidate(jsep_candidate.get()); diff --git a/third_party/libwebrtc/pc/peer_connection_ice_unittest.cc b/third_party/libwebrtc/pc/peer_connection_ice_unittest.cc @@ -106,7 +106,6 @@ class PeerConnectionWrapperForIceTest : public PeerConnectionWrapper { const auto* desc = pc()->remote_description()->description(); RTC_DCHECK(!desc->contents().empty()); const auto& first_content = desc->contents()[0]; - candidate->set_transport_name(first_content.mid()); return CreateIceCandidate(first_content.mid(), -1, *candidate); } @@ -307,7 +306,6 @@ class PeerConnectionIceBaseTest : public ::testing::Test { auto* desc = sdesc->description(); RTC_DCHECK(!desc->contents().empty()); const auto& first_content = desc->contents()[0]; - candidate->set_transport_name(first_content.mid()); std::unique_ptr<IceCandidate> jsep_candidate = CreateIceCandidate(first_content.mid(), 0, *candidate); return sdesc->AddCandidate(jsep_candidate.get()); @@ -1617,9 +1615,7 @@ TEST_P(PeerConnectionIceTest, PrefersMidOverMLineIndex) { ASSERT_TRUE( caller->SetRemoteDescription(callee->CreateAnswerAndSetAsLocal())); - // `candidate.transport_name()` is empty. Candidate candidate = CreateLocalUdpCandidate(kCalleeAddress); - ASSERT_THAT(candidate.transport_name(), IsEmpty()); auto* audio_content = GetFirstAudioContent(caller->pc()->local_description()->description()); std::unique_ptr<IceCandidate> ice_candidate =