p2p: remove deprecated SetIceTiebreaker in favor of the PortArguments variant. Also drop the threading guard after making the tiebreaker const. Bug: webrtc:42224914 Change-Id: I0bfb4d8b389cce2ca4de42d55e78f7c59e556617 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/479761 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Sameer Vijaykar <samvi@google.com> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47971}
diff --git a/p2p/base/port.cc b/p2p/base/port.cc index df34461..7fb9694 100644 --- a/p2p/base/port.cc +++ b/p2p/base/port.cc
@@ -162,11 +162,6 @@ ice_role_ = role; } -void Port::SetIceTiebreaker(uint64_t tiebreaker) { - RTC_DCHECK_RUN_ON(thread_); - ice_tiebreaker_ = tiebreaker; -} - uint64_t Port::IceTiebreaker() const { RTC_DCHECK_RUN_ON(thread_); return ice_tiebreaker_;
diff --git a/p2p/base/port.h b/p2p/base/port.h index ea05541..d07d015 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h
@@ -198,8 +198,6 @@ bool payload) override = 0; */ - [[deprecated("Pass via PortParametersRef")]] void SetIceTiebreaker( - uint64_t tiebreaker) override; uint64_t IceTiebreaker() const override; bool SharedSocket() const override; @@ -603,7 +601,7 @@ bool enable_port_packets_ RTC_GUARDED_BY(thread_); IceRole ice_role_ RTC_GUARDED_BY(thread_); // https://datatracker.ietf.org/doc/html/rfc5245#section-5.2 - uint64_t ice_tiebreaker_ RTC_GUARDED_BY(thread_); + const uint64_t ice_tiebreaker_; bool shared_socket_ RTC_GUARDED_BY(thread_); // A virtual cost perceived by the user, usually based on the network type
diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h index 964b4ac..36602bb 100644 --- a/p2p/base/port_interface.h +++ b/p2p/base/port_interface.h
@@ -58,8 +58,6 @@ virtual void SetIceRole(IceRole role) = 0; virtual IceRole GetIceRole() const = 0; - [[deprecated("Pass ICE tiebreaker at construction time.")]] virtual void - SetIceTiebreaker(uint64_t tiebreaker) = 0; virtual uint64_t IceTiebreaker() const = 0; virtual bool SharedSocket() const = 0;