tor-browser

commit 692a56b0257a84dcab290d28b21de1a7d4bcdeee
parent e1da6c9ca30bfa4f782c2970a137887dd84e5348
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon,  1 Dec 2025 20:24:08 -0700

Bug 2000941 - Vendor libwebrtc from 83ffd8d236

Upstream commit: https://webrtc.googlesource.com/src/+/83ffd8d2363c02ec17c0a88c22e5b45eff00fa71
    Remove Candidate::transport_name

    Bug: webrtc:42233526
    Change-Id: I06ed6b193d975621bd251358ce08a9bfcdd323e3
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/409260
    Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
    Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45644}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/api/candidate.cc
 | 
11
+++++------
M
third_party/libwebrtc/api/candidate.h
 | 
12
------------
M
third_party/libwebrtc/pc/jsep_ice_candidate.cc
 | 
8
--------

4 files changed, 7 insertions(+), 28 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 /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T03:21:36.467706+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T03:23:54.849472+00:00.
 # base of lastest vendoring
-e7fef8d7e8
+83ffd8d236
diff --git a/third_party/libwebrtc/api/candidate.cc b/third_party/libwebrtc/api/candidate.cc
@@ -128,11 +128,10 @@ std::string Candidate::ToStringInternal(bool sensitive) const {
       sensitive ? address_.ToSensitiveString() : address_.ToString();
   std::string related_address = sensitive ? related_address_.ToSensitiveString()
                                           : related_address_.ToString();
-  ost << "Cand[" << transport_name_ << ":" << foundation_ << ":" << component_
-      << ":" << protocol_ << ":" << priority_ << ":" << address << ":"
-      << type_name() << ":" << related_address << ":" << username_ << ":"
-      << password_ << ":" << network_id_ << ":" << network_cost_ << ":"
-      << generation_ << "]";
+  ost << "Cand[:" << foundation_ << ":" << component_ << ":" << protocol_ << ":"
+      << priority_ << ":" << address << ":" << type_name() << ":"
+      << related_address << ":" << username_ << ":" << password_ << ":"
+      << network_id_ << ":" << network_cost_ << ":" << generation_ << "]";
   return ost.Release();
 }
 
@@ -188,7 +187,7 @@ bool Candidate::operator==(const Candidate& o) const {
          network_type_ == o.network_type_ && generation_ == o.generation_ &&
          foundation_ == o.foundation_ &&
          related_address_ == o.related_address_ && tcptype_ == o.tcptype_ &&
-         transport_name_ == o.transport_name_ && network_id_ == o.network_id_;
+         network_id_ == o.network_id_;
 }
 
 bool Candidate::operator!=(const Candidate& o) const {
diff --git a/third_party/libwebrtc/api/candidate.h b/third_party/libwebrtc/api/candidate.h
@@ -191,17 +191,6 @@ class RTC_EXPORT Candidate {
   const std::string& tcptype() const { return tcptype_; }
   void set_tcptype(absl::string_view tcptype) { Assign(tcptype_, tcptype); }
 
-  // The name of the transport channel of this candidate.
-  // TODO(bugs.webrtc.org/42233526): remove.
-  [[deprecated("Use IceCandidate::sdp_mid")]]
-  const std::string& transport_name() const {
-    return transport_name_;
-  }
-  [[deprecated("Use the IceCandidate type for sdp_mid")]]
-  void set_transport_name(absl::string_view transport_name) {
-    Assign(transport_name_, transport_name);
-  }
-
   // The URL of the ICE server which this candidate is gathered from.
   const std::string& url() const { return url_; }
   void set_url(absl::string_view url) { Assign(url_, url); }
@@ -283,7 +272,6 @@ class RTC_EXPORT Candidate {
   std::string foundation_;
   SocketAddress related_address_;
   std::string tcptype_;
-  std::string transport_name_;
   uint16_t network_id_;
   uint16_t network_cost_;
   std::string url_;
diff --git a/third_party/libwebrtc/pc/jsep_ice_candidate.cc b/third_party/libwebrtc/pc/jsep_ice_candidate.cc
@@ -55,14 +55,6 @@ std::unique_ptr<IceCandidate> IceCandidate::Create(absl::string_view mid,
   if (!ParseCandidate(sdp, &candidate, error, true)) {
     return nullptr;
   }
-  // TODO(bugs.webrtc.org/42233526): The Candidate::transport_name() property
-  // has been deprecated. At this level, the mid is already a property of
-  // IceCandidate and reduntant for Candidate. Remove this when removing
-  // Candidate::transport_name().
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  candidate.set_transport_name(mid);
-#pragma clang diagnostic pop
   return std::make_unique<IceCandidate>(mid, sdp_mline_index, candidate);
 }