Source release 19.3.0

core/include/policy_timers.h

@@ -8,22 +8,22 @@
 #include <memory>
 #include <string>
 
-#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "wv_cdm_constants.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
-
 // This is driven by the Policy Engine and maintains timer related
 // information from the policy such as duration windows and renewals.
 // Timer expiration behavior has changed with the introduction of core
 // messages in OEMCrypto v16. Handling of behavior that differs between
 // a OEMCrypto v16 license with core messages and one without is left to
 // a class that derives from this interface.
-
 class PolicyTimers {
  public:
+  WVCDM_DISALLOW_COPY_AND_MOVE(PolicyTimers);
+
   virtual ~PolicyTimers() {}
 
   // SetLicense is used in handling the initial license response.
@@ -143,10 +143,6 @@ class PolicyTimers {
       int64_t current_time, bool ignore_soft_enforce_playback_duration);
   bool HasRentalOrPlaybackDurationExpired(int64_t current_time);
   virtual int64_t GetRentalDurationRemaining(int64_t current_time);
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(PolicyTimers);
-};
-
+};  // class PolicyTimers
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_POLICY_TIMERS_H_