commit 2afd2840169f4e2dc69b5575f51183bd4b3e6b34
author Tommi <tommi@webrtc.org> Tue Sep 05 07:36:24 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 05 10:07:30 2023
tree 97422f0dcb727a422487966c4db6ed8389c4cf39
parent 85c05a8a1702d2e94daf6436043523998ba413b0

Rename [Un]SubscribeClose event subscription methods for clarity.

This is following up on a discussion here:
https://webrtc-review.googlesource.com/c/src/+/318061

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

rtc_base/async_packet_socket.cc

diff --git a/rtc_base/async_packet_socket.cc b/rtc_base/async_packet_socket.cc
index 465a35d..f50138c 100644
--- a/rtc_base/async_packet_socket.cc
+++ b/rtc_base/async_packet_socket.cc
@@ -26,14 +26,14 @@
 
 AsyncPacketSocket::~AsyncPacketSocket() = default;
 
-void AsyncPacketSocket::SubscribeClose(
+void AsyncPacketSocket::SubscribeCloseEvent(
     const void* removal_tag,
     std::function<void(AsyncPacketSocket*, int)> callback) {
   RTC_DCHECK_RUN_ON(&network_checker_);
   on_close_.AddReceiver(removal_tag, std::move(callback));
 }
 
-void AsyncPacketSocket::UnsubscribeClose(const void* removal_tag) {
+void AsyncPacketSocket::UnsubscribeCloseEvent(const void* removal_tag) {
   RTC_DCHECK_RUN_ON(&network_checker_);
   on_close_.RemoveReceivers(removal_tag);
 }

rtc_base/async_packet_socket.h

diff --git a/rtc_base/async_packet_socket.h b/rtc_base/async_packet_socket.h
index ad9a79e..0d3ceb9 100644
--- a/rtc_base/async_packet_socket.h
+++ b/rtc_base/async_packet_socket.h
@@ -110,9 +110,10 @@
   virtual void SetError(int error) = 0;
 
   // Register a callback to be called when the socket is closed.
-  void SubscribeClose(const void* removal_tag,
-                      std::function<void(AsyncPacketSocket*, int)> callback);
-  void UnsubscribeClose(const void* removal_tag);
+  void SubscribeCloseEvent(
+      const void* removal_tag,
+      std::function<void(AsyncPacketSocket*, int)> callback);
+  void UnsubscribeCloseEvent(const void* removal_tag);
 
   // Emitted each time a packet is read. Used only for UDP and
   // connected TCP sockets.

rtc_base/test_echo_server.h

diff --git a/rtc_base/test_echo_server.h b/rtc_base/test_echo_server.h
index 8e3c432..8281762 100644
--- a/rtc_base/test_echo_server.h
+++ b/rtc_base/test_echo_server.h
@@ -46,7 +46,7 @@
     if (raw_socket) {
       AsyncTCPSocket* packet_socket = new AsyncTCPSocket(raw_socket);
       packet_socket->SignalReadPacket.connect(this, &TestEchoServer::OnPacket);
-      packet_socket->SubscribeClose(
+      packet_socket->SubscribeCloseEvent(
           this, [this](AsyncPacketSocket* s, int err) { OnClose(s, err); });
       client_sockets_.push_back(packet_socket);
     }