Source release 14.0.0

core/include/certificate_provisioning.h

@@ -10,6 +10,7 @@
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
 #include "scoped_ptr.h"
+#include "service_certificate.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {
@@ -21,13 +22,13 @@ class ServiceCertificate;
 
 class CertificateProvisioning {
  public:
-  CertificateProvisioning(metrics::CryptoMetrics* metrics,
-                          ServiceCertificate* service_certificate) :
+  CertificateProvisioning(metrics::CryptoMetrics* metrics) :
       crypto_session_(metrics),
       cert_type_(kCertificateWidevine),
-      service_certificate_(service_certificate) {}
+      service_certificate_(new ServiceCertificate()) {}
+  ~CertificateProvisioning() {}
 
-  ~CertificateProvisioning() {};
+  CdmResponseType Init(const std::string& service_certificate);
 
   // Construct a valid provisioning request.
   // The request will be sent to the provisioning server.
@@ -43,6 +44,7 @@ class CertificateProvisioning {
       std::string* cert, std::string* wrapped_key);
 
  private:
+  // TODO(b/36897239): Remove this once it is no longer needed.
   bool GetProvisioningTokenType(
       video_widevine::ClientIdentification::TokenType* token_type);
 
@@ -54,7 +56,7 @@ class CertificateProvisioning {
 
   CryptoSession crypto_session_;
   CdmCertificateType cert_type_;
-  ServiceCertificate* service_certificate_;
+  scoped_ptr<ServiceCertificate> service_certificate_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CertificateProvisioning);
 };