Source release 19.3.0

core/include/properties.h

@@ -11,8 +11,8 @@
 #include <string>
 
 #include "cdm_client_property_set.h"
-#include "disallow_copy_and_assign.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 #if defined(UNIT_TEST)
 #include <gtest/gtest_prod.h>
@@ -30,6 +30,9 @@ using CdmClientPropertySetMap = std::map<CdmSessionId, CdmClientPropertySet*>;
 // Setter methods are provided but their only planned use is for testing.
 class Properties {
  public:
+  Properties() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(Properties);
+
   static void Init() {
     std::unique_lock<std::mutex> lock(init_mutex_);
 
@@ -156,10 +159,6 @@ class Properties {
   static bool allow_restore_of_offline_licenses_with_release_;
   static bool delay_oem_crypto_termination_;
   static std::unique_ptr<CdmClientPropertySetMap> session_property_set_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(Properties);
-};
-
+};  // class Properties
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_PROPERTIES_H_