Source release 14.1.0

core/include/crypto_session.h

@@ -1,4 +1,6 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 
 #ifndef WVCDM_CORE_CRYPTO_SESSSION_H_
 #define WVCDM_CORE_CRYPTO_SESSSION_H_
@@ -8,6 +10,7 @@
 #include <vector>
 
 #include "OEMCryptoCENC.h"
+#include "disallow_copy_and_assign.h"
 #include "key_session.h"
 #include "lock.h"
 #include "metrics_collections.h"
@@ -196,10 +199,13 @@ class CryptoSession {
   virtual bool GenerateSubSessionNonce(const std::string& sub_session_key_id,
                                        bool* exists, uint32_t* nonce);
 
+  virtual CdmResponseType GetProvisioningMethod(
+      SecurityLevel requested_security_level,
+      CdmClientTokenType* token_type);
+
  private:
   friend class CryptoSessionForTest;
 
-  bool GetProvisioningMethod(CdmClientTokenType* token_type);
   void Init();
   void Terminate();
   bool GetTokenFromKeybox(std::string* token);