commit 14af7622a7ea040949bfcf56c2a1a042b3a085bb
author Byoungchan Lee <daniel.l@hpcnt.com> Tue Jan 11 20:24:58 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 13 20:42:15 2022
tree 9d4646f0aba0d3a45ddd734adbb29f721e0101a6
parent ca15fcd37edac30ad5688d90fbb3d88e3544f63f

Remove RTC_DISALLOW_COPY_AND_ASSIGN from rtc_base/

Bug: webrtc:13555, webrtc:13082
Change-Id: I406b7f04497562866ea3329e97c5adc96e927b6f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/245680
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: (Daniel.L) Byoungchan Lee <daniel.l@hpcnt.com>
Cr-Commit-Position: refs/heads/main@{#35691}

rtc_base/socket_adapters.h

diff --git a/rtc_base/socket_adapters.h b/rtc_base/socket_adapters.h
index 67d3bbf..55f6211 100644
--- a/rtc_base/socket_adapters.h
+++ b/rtc_base/socket_adapters.h
@@ -15,7 +15,6 @@
 
 #include "api/array_view.h"
 #include "rtc_base/async_socket.h"
-#include "rtc_base/constructor_magic.h"
 #include "rtc_base/crypt_string.h"
 
 namespace rtc {
@@ -34,6 +33,9 @@
   BufferedReadAdapter(Socket* socket, size_t buffer_size);
   ~BufferedReadAdapter() override;
 
+  BufferedReadAdapter(const BufferedReadAdapter&) = delete;
+  BufferedReadAdapter& operator=(const BufferedReadAdapter&) = delete;
+
   int Send(const void* pv, size_t cb) override;
   int Recv(void* pv, size_t cb, int64_t* timestamp) override;
 
@@ -51,7 +53,6 @@
   char* buffer_;
   size_t buffer_size_, data_len_;
   bool buffering_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(BufferedReadAdapter);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -65,12 +66,14 @@
 
   explicit AsyncSSLSocket(Socket* socket);
 
+  AsyncSSLSocket(const AsyncSSLSocket&) = delete;
+  AsyncSSLSocket& operator=(const AsyncSSLSocket&) = delete;
+
   int Connect(const SocketAddress& addr) override;
 
  protected:
   void OnConnectEvent(Socket* socket) override;
   void ProcessInput(char* data, size_t* len) override;
-  RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSSLSocket);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -85,6 +88,9 @@
                         const CryptString& password);
   ~AsyncHttpsProxySocket() override;
 
+  AsyncHttpsProxySocket(const AsyncHttpsProxySocket&) = delete;
+  AsyncHttpsProxySocket& operator=(const AsyncHttpsProxySocket&) = delete;
+
   // If connect is forced, the adapter will always issue an HTTP CONNECT to the
   // target address.  Otherwise, it will connect only if the destination port
   // is not port 80.
@@ -128,7 +134,6 @@
   } state_;
   HttpAuthContext* context_;
   std::string unknown_mechanisms_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(AsyncHttpsProxySocket);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -142,6 +147,9 @@
                         const CryptString& password);
   ~AsyncSocksProxySocket() override;
 
+  AsyncSocksProxySocket(const AsyncSocksProxySocket&) = delete;
+  AsyncSocksProxySocket& operator=(const AsyncSocksProxySocket&) = delete;
+
   int Connect(const SocketAddress& addr) override;
   SocketAddress GetRemoteAddress() const override;
   int Close() override;
@@ -162,7 +170,6 @@
   SocketAddress proxy_, dest_;
   std::string user_;
   CryptString pass_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(AsyncSocksProxySocket);
 };
 
 }  // namespace rtc