Source release 19.3.0

core/include/crypto_session.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_CRYPTO_SESSION_H_
 #define WVCDM_CORE_CRYPTO_SESSION_H_
 
@@ -14,13 +13,13 @@
 
 #include "OEMCryptoCENC.h"
 #include "crypto_wrapped_key.h"
-#include "disallow_copy_and_assign.h"
 #include "key_session.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
 #include "rw_lock.h"
 #include "timer_metric.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 class CryptoKey;
@@ -71,6 +70,8 @@ class CryptoSession {
 
   static const char* HdcpCapabilityToString(HdcpCapability hdcp_level);
 
+  CryptoSession() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(CryptoSession);
   virtual ~CryptoSession();
 
   // This method will try to terminate OEMCrypto if |session_size_| is 0.
@@ -584,24 +585,18 @@ class CryptoSession {
   // be created for the system if OTA keybox provisioning is both
   // required and supported by L1.
   static std::unique_ptr<okp::SystemFallbackPolicy> okp_fallback_policy_l1_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);
 };  // class CryptoSession
 
 class CryptoSessionFactory {
  public:
+  WVCDM_DISALLOW_COPY_AND_MOVE(CryptoSessionFactory);
   virtual ~CryptoSessionFactory() {}
   virtual CryptoSession* MakeCryptoSession(
       metrics::CryptoMetrics* crypto_metrics);
 
  protected:
   friend class CryptoSession;
-  CryptoSessionFactory() {}
-
- private:
-  CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSessionFactory);
-};
-
+  CryptoSessionFactory() = default;
+};  // class CryptoSessionFactory
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CRYPTO_SESSION_H_