Source release 19.3.0

core/include/crypto_key.h

@@ -1,18 +1,21 @@
 // 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_CRYPTO_KEY_H_
 #define WVCDM_CORE_CRYPTO_KEY_H_
 
+#include <string>
+
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
 
 class CryptoKey {
  public:
-  CryptoKey(){};
-  ~CryptoKey(){};
+  CryptoKey() = default;
+  WVCDM_DEFAULT_COPY_AND_MOVE(CryptoKey);
+  ~CryptoKey() {}
 
   const std::string& key_id() const { return key_id_; }
   const std::string& key_data() const { return key_data_; }
@@ -50,8 +53,6 @@ class CryptoKey {
   std::string track_label_;
   std::string entitlement_key_id_;
   CdmCipherMode cipher_mode_;
-};
-
+};  // class CryptoKey
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_CRYPTO_KEY_H_