Source release 19.3.0

core/include/cdm_usage_table.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_USAGE_TABLE_H_
 #define WVCDM_CORE_CDM_USAGE_TABLE_H_
 
@@ -13,17 +12,16 @@
 #include "clock.h"
 #include "crypto_session.h"
 #include "device_files.h"
-#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "metrics_collections.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 #if defined(UNIT_TEST)
 #  include <gtest/gtest_prod.h>
 #endif
 
 namespace wvcdm {
-
 // Offline licenses/secure stops may be securely tracked using usage
 // tables (OEMCrypto v9-12) or usage table headers+usage entries
 // (OEMCrypto v13+). This class assists with the latter, synchronizing
@@ -51,6 +49,7 @@ namespace wvcdm {
 class CdmUsageTable {
  public:
   CdmUsageTable();
+  WVCDM_DISALLOW_COPY_AND_MOVE(CdmUsageTable);
   virtual ~CdmUsageTable() {}
 
   // |crypto_session| is used to create or load a usage master table
@@ -362,10 +361,6 @@ class CdmUsageTable {
 
   // Test related data members
   std::unique_ptr<CryptoSession> test_crypto_session_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(CdmUsageTable);
-};
-
+};  // class CdmUsageTable
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CDM_USAGE_TABLE_H_