tor-browser

commit 4a9624e90e412fa6c140f96c9777fdbb82480729
parent 17c9566e74bfc2ffa4fa95c69eeff650886047e9
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon,  1 Dec 2025 18:39:02 -0700

Bug 2000941 - Vendor libwebrtc from e782b1a994

Upstream commit: https://webrtc.googlesource.com/src/+/e782b1a994f1ad59e6b96fd96f19462c588c2368
    Remove deprecated observer method, OnIceCandidatesRemoved

    The `OnIceCandidatesRemoved` observer method was previously deprecated
    in favor of the more granular, IceCandidate based, `OnIceCandidateRemoved` method. As downstream users have migrated to the
    new API, the deprecated method and its backward compatibility shims can
    now be safely removed.

    This change removes the `OnIceCandidatesRemoved` method from the
    `PeerConnectionObserverInterface` and deletes the compatibility code
    from the default `OnIceCandidateRemoved` implementation. The logic in
    `PeerConnection::RemoveIceCandidates` is also simplified accordingly.

    Bug: webrtc:42233526
    Change-Id: I7b14ce4c2b387e7e75f99606474d73bb4a3df5f2
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/407280
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45607}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/api/peer_connection_interface.h
 | 
14
--------------
M
third_party/libwebrtc/pc/peer_connection.cc
 | 
8
+-------

3 files changed, 3 insertions(+), 23 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-02T01:36:18.179043+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T01:38:43.064115+00:00.
 # base of lastest vendoring
-f70b479f77
+e782b1a994
diff --git a/third_party/libwebrtc/api/peer_connection_interface.h b/third_party/libwebrtc/api/peer_connection_interface.h
@@ -1314,22 +1314,8 @@ class PeerConnectionObserver {
                                    int /* error_code */,
                                    const std::string& /* error_text */) {}
 
-  // Ice candidates have been removed.
-  [[deprecated("Implement OnIceCandidateRemoved")]]
-  virtual void OnIceCandidatesRemoved(
-      const std::vector<Candidate>& /* candidates */) {}
-
   // Fired when an IceCandidate has been removed.
-  // TODO(tommi): Make pure virtual when `OnIceCandidatesRemoved` can be
-  // removed.
   virtual void OnIceCandidateRemoved(const IceCandidate* candidate) {
-    // Backwards compatibility stub implementation while downstream code is
-    // migrated over to `OnIceCandidateRemoved` and away from
-    // `OnIceCandidatesRemoved`.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    OnIceCandidatesRemoved({candidate->candidate()});
-#pragma clang diagnostic pop
   }
 
   // Called when the ICE connection receiving status changes.
diff --git a/third_party/libwebrtc/pc/peer_connection.cc b/third_party/libwebrtc/pc/peer_connection.cc
@@ -2085,13 +2085,7 @@ void PeerConnection::OnIceCandidatesRemoved(
     return;
   }
 
-  for (Candidate candidate : candidates) {  // Get a copy to set the transport.
-    // For backwards compatibility reasons, all candidate instances still need
-    // to have the transport_name() property set to the `mid`.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    candidate.set_transport_name(mid);
-#pragma clang diagnostic pop
+  for (const Candidate& candidate : candidates) {
     IceCandidate c(mid, -1, candidate);
     RunWithObserver([&](auto o) { o->OnIceCandidateRemoved(&c); });
   }