Source release 19.3.0

core/include/device_files.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_DEVICE_FILES_H_
 #define WVCDM_CORE_DEVICE_FILES_H_
 
@@ -12,10 +11,10 @@
 
 #include "crypto_wrapped_key.h"
 #include "device_files.pb.h"
-#include "disallow_copy_and_assign.h"
 #include "okp_info.h"
 #include "platform.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 #if defined(UNIT_TEST)
 #  include <gtest/gtest_prod.h>
@@ -23,7 +22,7 @@
 
 namespace wvutil {
 class FileSystem;
-}
+}  // namespace wvutil
 
 namespace wvcdm {
 
@@ -124,6 +123,8 @@ class DeviceFiles {
     CryptoWrappedKey wrapped_private_key;
   };
 
+  DeviceFiles() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(DeviceFiles);
   DeviceFiles(wvutil::FileSystem*);
   virtual ~DeviceFiles();
 
@@ -387,10 +388,6 @@ class DeviceFiles {
   wvutil::FileSystem* file_system_;
   CdmSecurityLevel security_level_;
   bool initialized_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(DeviceFiles);
-};
-
+};  // class DeviceFiles
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_DEVICE_FILES_H_