Source release 19.3.0

core/include/cdm_engine.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_CDM_ENGINE_H_
 #define WVCDM_CORE_CDM_ENGINE_H_
 
@@ -14,7 +13,6 @@
 #include "certificate_provisioning.h"
 #include "clock.h"
 #include "crypto_session.h"
-#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "initialization_data.h"
 #include "metrics_collections.h"
@@ -22,6 +20,7 @@
 #include "service_certificate.h"
 #include "wv_cdm_constants.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 class CdmClientPropertySet;
@@ -38,6 +37,9 @@ using CdmReleaseKeySetMap =
 
 class CdmEngine {
  public:
+  CdmEngine() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(CdmEngine);
+
   virtual ~CdmEngine();
 
   // Session related methods
@@ -495,10 +497,6 @@ class CdmEngine {
   // To prevent race conditions around the engine's OKP state, this mutex
   // should be locked before the use of any of the |okp_*| variables.
   std::mutex okp_mutex_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(CdmEngine);
-};
-
+};  // class CdmEngine
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CDM_ENGINE_H_