Source release 19.3.0

core/include/policy_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_POLICY_ENGINE_H_
 #define WVCDM_CORE_POLICY_ENGINE_H_
 
@@ -10,14 +9,14 @@
 #include <string>
 
 #include "clock.h"
-#include "disallow_copy_and_assign.h"
 #include "license_key_status.h"
 #include "license_protocol.pb.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvutil {
 class Clock;
-}
+}  // namespace wvutil
 
 namespace wvcdm {
 
@@ -32,6 +31,9 @@ class WvCdmEventListener;
 // or no(false) you may not decrypt this data anymore."
 class PolicyEngine {
  public:
+  PolicyEngine() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(PolicyEngine);
+
   PolicyEngine(CdmSessionId session_id, WvCdmEventListener* event_listener,
                CryptoSession* crypto_session);
   virtual ~PolicyEngine();
@@ -204,10 +206,6 @@ class PolicyEngine {
 
   std::unique_ptr<PolicyTimers> policy_timers_;
   std::unique_ptr<wvutil::Clock> clock_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(PolicyEngine);
-};
-
+};  // class PolicyEngine
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_POLICY_ENGINE_H_