Source release 19.3.0

core/include/cdm_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_CDM_SESSION_H_
 #define WVCDM_CORE_CDM_SESSION_H_
 
@@ -12,7 +11,6 @@
 
 #include "crypto_session.h"
 #include "device_files.h"
-#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "initialization_data.h"
 #include "license.h"
@@ -21,6 +19,7 @@
 #include "policy_engine.h"
 #include "timer_metric.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 
@@ -32,6 +31,9 @@ class SystemIdExtractor;
 
 class CdmSession {
  public:
+  CdmSession() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(CdmSession);
+
   // Creates a new instance of the CdmSession with the given |file_system|
   // and |metrics| parameters. Both parameters are owned by the caller and
   // must remain in scope throughout the scope of the new instance. |metrics|
@@ -345,10 +347,6 @@ class CdmSession {
   bool mock_crypto_session_in_use_ = false;
   bool mock_license_parser_in_use_ = false;
   bool mock_policy_engine_in_use_ = false;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(CdmSession);
-};
-
+};  // class CdmSession
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CDM_SESSION_H_