Source release 19.3.0

core/test/http_socket.h

@@ -1,7 +1,6 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
 // source code may only be used and distributed under the Widevine License
 // Agreement.
-
 #ifndef CDM_TEST_HTTP_SOCKET_H_
 #define CDM_TEST_HTTP_SOCKET_H_
 
@@ -13,13 +12,14 @@
 #include <gtest/gtest_prod.h>
 #include <openssl/ssl.h>
 
-#include "disallow_copy_and_assign.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
-
 // Provides basic Linux based TCP socket interface.
 class HttpSocket {
  public:
+  HttpSocket() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(HttpSocket);
   // A scheme (http:// or https://) is required for the URL.
   explicit HttpSocket(const std::string& url);
   ~HttpSocket();
@@ -70,10 +70,6 @@ class HttpSocket {
   // When the socket was created. Logged on error to help debug flaky
   // tests. e.g. b/186031735
   std::time_t create_time_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(HttpSocket);
-};
-
+};  // class HttpSocket
 }  // namespace wvcdm
-
 #endif  // CDM_TEST_HTTP_SOCKET_H_