Source release 19.3.0

core/include/policy_timers_v16.h

@@ -1,17 +1,17 @@
 // Copyright 2020 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_V16_H_
 #define WVCDM_CORE_POLICY_TIMERS_V16_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 v16 and core messages introduced changes to how duration values
 // and clocks should be evaluated. This class provides backward compatibility
 // for licenses that do not include a core message. Durations are handled
@@ -21,10 +21,10 @@ namespace wvcdm {
 //  * OEMCrypto has not been upgraded to v16
 //  * Licenses were persisted before the device was upgraded to v16
 //  * License service does not yet support core messages
-
 class PolicyTimersV16 : public PolicyTimers {
  public:
-  PolicyTimersV16() {}
+  PolicyTimersV16() = default;
+  WVCDM_DISALLOW_COPY_AND_MOVE(PolicyTimersV16);
 
   ~PolicyTimersV16() override {}
 
@@ -45,11 +45,6 @@ class PolicyTimersV16 : public PolicyTimers {
 
   // Renewal related methods
   bool HasRenewalDelayExpired(int64_t current_time) override;
-
- private:
-  CORE_DISALLOW_COPY_AND_ASSIGN(PolicyTimersV16);
-};
-
+};  // class PolicyTimersV16
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_POLICY_TIMERS_V16_H_