Source release 19.3.0

core/include/ota_keybox_provisioner.h

@@ -8,9 +8,9 @@
 #include <string>
 
 #include "client_identification.h"
-#include "disallow_copy_and_assign.h"
 #include "metrics_collections.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 class CryptoSession;
@@ -32,6 +32,8 @@ class OtaKeyboxProvisioner {
       std::unique_ptr<CryptoSession>&& crypto_session,
       okp::SystemFallbackPolicy* fallback_policy);
 
+  OtaKeyboxProvisioner() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(OtaKeyboxProvisioner);
   ~OtaKeyboxProvisioner();
 
   // Returns true if the underlying SystemFallbackPolicy is
@@ -78,8 +80,6 @@ class OtaKeyboxProvisioner {
   // These flags are for debugging purposes.
   bool request_generated_ = false;
   bool response_received_ = false;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(OtaKeyboxProvisioner);
 };  // class OtaKeyboxProvisioner
 }  // namespace wvcdm
 #endif  // WVCDM_CORE_OTA_KEYBOX_PROVISIONER_H_