commit d0b88797705cfc6c1d60ad325d1923f326f10de1
author Niels Möller <nisse@webrtc.org> Thu Aug 12 10:32:30 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 17 15:39:25 2021 +0000
tree e73a47bd467939d5ad0a0e15e33355ebf3f3863d
parent 45b3e530cb4999010b572ea60b63916fdb79d66b

Delete AsyncSocket class, merge into Socket class

Bug: webrtc:13065
Change-Id: I13afee2386ea9c4de0e4fa95133f0c4d3ec826e8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227031
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34787}

rtc_base/async_socket.cc

diff --git a/rtc_base/async_socket.cc b/rtc_base/async_socket.cc
index e80514d..7289b5c 100644
--- a/rtc_base/async_socket.cc
+++ b/rtc_base/async_socket.cc
@@ -15,11 +15,7 @@
 
 namespace rtc {
 
-AsyncSocket::AsyncSocket() {}
-
-AsyncSocket::~AsyncSocket() {}
-
-AsyncSocketAdapter::AsyncSocketAdapter(AsyncSocket* socket)
+AsyncSocketAdapter::AsyncSocketAdapter(Socket* socket)
     : socket_(absl::WrapUnique(socket)) {
   RTC_DCHECK(socket_);
   socket_->SignalConnectEvent.connect(this,
@@ -70,7 +66,7 @@
   return socket_->Listen(backlog);
 }
 
-AsyncSocket* AsyncSocketAdapter::Accept(SocketAddress* paddr) {
+Socket* AsyncSocketAdapter::Accept(SocketAddress* paddr) {
   return socket_->Accept(paddr);
 }
 
@@ -86,7 +82,7 @@
   return socket_->SetError(error);
 }
 
-AsyncSocket::ConnState AsyncSocketAdapter::GetState() const {
+Socket::ConnState AsyncSocketAdapter::GetState() const {
   return socket_->GetState();
 }
 
@@ -98,19 +94,19 @@
   return socket_->SetOption(opt, value);
 }
 
-void AsyncSocketAdapter::OnConnectEvent(AsyncSocket* socket) {
+void AsyncSocketAdapter::OnConnectEvent(Socket* socket) {
   SignalConnectEvent(this);
 }
 
-void AsyncSocketAdapter::OnReadEvent(AsyncSocket* socket) {
+void AsyncSocketAdapter::OnReadEvent(Socket* socket) {
   SignalReadEvent(this);
 }
 
-void AsyncSocketAdapter::OnWriteEvent(AsyncSocket* socket) {
+void AsyncSocketAdapter::OnWriteEvent(Socket* socket) {
   SignalWriteEvent(this);
 }
 
-void AsyncSocketAdapter::OnCloseEvent(AsyncSocket* socket, int err) {
+void AsyncSocketAdapter::OnCloseEvent(Socket* socket, int err) {
   SignalCloseEvent(this, err);
 }