Source release 19.3.0

core/include/policy_timers_v18.h

@@ -1,27 +1,27 @@
 // Copyright 2022 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_POLICY_TIMERS_V18_H_
 #define WVCDM_CORE_POLICY_TIMERS_V18_H_
 
-#include "disallow_copy_and_assign.h"
+#include <inttypes.h>
+
 #include "license_protocol.pb.h"
 #include "policy_timers.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
-
 // OEMCrypto v18 includes support for renewing licenses on load by using
 // |initial_renewal_delay_base| and TimerDelayBase.
 //
 // Backward compatibility may be needed if
 //  * OEMCrypto has not been upgraded to v18
 //  * Licenses were persisted before the device was upgraded to v18
-
 class PolicyTimersV18 : public PolicyTimers {
  public:
-  PolicyTimersV18() {}
+  PolicyTimersV18() = default;
+  WVCDM_DISALLOW_COPY_AND_MOVE(PolicyTimersV18);
 
   ~PolicyTimersV18() override {}
 
@@ -48,10 +48,6 @@ class PolicyTimersV18 : public PolicyTimers {
   bool license_renewal_ = false;
   bool renew_on_first_decrypt_ = false;
   bool can_renew_ = false;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(PolicyTimersV18);
-};
-
+};  // class PolicyTimersV18
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_POLICY_TIMERS_V18_H_