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}
diff --git a/rtc_base/async_tcp_socket_unittest.cc b/rtc_base/async_tcp_socket_unittest.cc
index c701433..af82238 100644
--- a/rtc_base/async_tcp_socket_unittest.cc
+++ b/rtc_base/async_tcp_socket_unittest.cc
@@ -22,7 +22,7 @@
  public:
   AsyncTCPSocketTest()
       : vss_(new rtc::VirtualSocketServer()),
-        socket_(vss_->CreateAsyncSocket(SOCK_STREAM)),
+        socket_(vss_->CreateSocket(SOCK_STREAM)),
         tcp_socket_(new AsyncTCPSocket(socket_, true)),
         ready_to_send_(false) {
     tcp_socket_->SignalReadyToSend.connect(this,
@@ -33,7 +33,7 @@
 
  protected:
   std::unique_ptr<VirtualSocketServer> vss_;
-  AsyncSocket* socket_;
+  Socket* socket_;
   std::unique_ptr<AsyncTCPSocket> tcp_socket_;
   bool ready_to_send_;
 };