Source release 19.3.0

core/test/license_request.h

@@ -1,31 +1,27 @@
 // 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_LICENSE_REQUEST_H_
 #define CDM_TEST_LICENSE_REQUEST_H_
 
 #include <string>
-#include "disallow_copy_and_assign.h"
+
+#include "wv_class_utils.h"
 
 namespace wvcdm {
-
 // Parses response from a license request.
 // This class assumes a particular response format defined by
 // Google license servers.
 class LicenseRequest {
  public:
-  LicenseRequest() {}
+  LicenseRequest() = default;
+  WVCDM_DISALLOW_COPY_AND_MOVE(LicenseRequest);
   ~LicenseRequest() {}
 
   void GetDrmMessage(const std::string& response, std::string& drm_msg);
 
  private:
   size_t FindHeaderEndPosition(const std::string& response) const;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(LicenseRequest);
-};
-
+};  // class LicenseRequest
 }  // namespace wvcdm
-
 #endif  // CDM_TEST_LICENSE_REQUEST_H_