Source release 19.3.0

core/include/cdm_session_map.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_MAP_H_
 #define WVCDM_CORE_CDM_SESSION_MAP_H_
 
@@ -10,8 +9,8 @@
 #include <string>
 
 #include "cdm_session.h"
-#include "disallow_copy_and_assign.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 
@@ -23,6 +22,8 @@ using CdmSessionList = std::list<std::shared_ptr<CdmSession> >;
 class CdmSessionMap {
  public:
   CdmSessionMap() {}
+  WVCDM_DISALLOW_COPY_AND_MOVE(CdmSessionMap);
+
   virtual ~CdmSessionMap();
 
   // Use |Terminate| rather than relying on the destructor to release
@@ -50,10 +51,6 @@ class CdmSessionMap {
                          std::shared_ptr<CdmSession>* session);
 
   CdmIdToSessionMap sessions_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(CdmSessionMap);
-};
-
+};  // class CdmSessionMap
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CDM_SESSION_MAP_H_