Source release 19.3.0

core/include/certificate_provisioning.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 WVCDM_CORE_CERTIFICATE_PROVISIONING_H_
 #define WVCDM_CORE_CERTIFICATE_PROVISIONING_H_
 
@@ -9,25 +8,27 @@
 #include <string>
 
 #include "crypto_session.h"
-#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
 #include "service_certificate.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvutil {
 class FileSystem;
-}
+}  // namespace wvutil
 
 namespace wvcdm {
-
 class CdmClientPropertySet;
 class CdmSession;
 class ServiceCertificate;
 
 class CertificateProvisioning {
  public:
+  CertificateProvisioning() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(CertificateProvisioning);
+
   CertificateProvisioning(metrics::CryptoMetrics* metrics)
       : crypto_session_(CryptoSession::MakeCryptoSession(metrics)),
         cert_type_(kCertificateWidevine),
@@ -134,10 +135,6 @@ class CertificateProvisioning {
   CryptoWrappedKey::Type provisioning_40_key_type_;
   // Store the last provisioning request message
   std::string provisioning_request_message_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(CertificateProvisioning);
-};
-
+};  // class CertificateProvisioning
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CERTIFICATE_PROVISIONING_H_