Source release 19.3.0

core/include/key_session.h

@@ -1,26 +1,26 @@
 // 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_KEY_SESSION_H_
 #define WVCDM_CORE_KEY_SESSION_H_
 
+#include <string>
 #include <vector>
 
 #include "OEMCryptoCENC.h"
 #include "metrics_collections.h"
 #include "wv_cdm_types.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
-
 class CryptoKey;
 
 class KeySession {
- protected:
-  KeySession(metrics::CryptoMetrics* metrics) : metrics_(metrics) {}
-
  public:
   typedef enum { kDefault, kEntitlement } KeySessionType;
+
+  KeySession() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(KeySession);
   virtual ~KeySession() {}
   virtual KeySessionType Type() = 0;
   virtual OEMCryptoResult LoadKeys(const std::string& message,
@@ -54,9 +54,9 @@ class KeySession {
                                         const std::string& signature) = 0;
 
  protected:
+  KeySession(metrics::CryptoMetrics* metrics) : metrics_(metrics) {}
+
   metrics::CryptoMetrics* metrics_;
-};
-
+};  // class KeySession
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_KEY_SESSION_H_