Add Properties to Query HDCP Status and Usage Reporting Support

This is a merge of http://go/wvgerrit/10846/ from the Widevine repository.

Change-Id: I682069073d9ec58c03781de25d9c6fa5ec5864ff

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -3,8 +3,11 @@
 #ifndef WVCDM_CORE_CDM_ENGINE_H_
 #define WVCDM_CORE_CDM_ENGINE_H_
 
+#include <string>
+
 #include "cdm_session.h"
 #include "certificate_provisioning.h"
+#include "crypto_session.h"
 #include "initialization_data.h"
 #include "oemcrypto_adapter.h"
 #include "scoped_ptr.h"
@@ -117,6 +120,8 @@ class CdmEngine {
 
   void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
 
+  std::string MapHdcpVersion(CryptoSession::OemCryptoHdcpVersion version);
+
   // instance variables
   CdmSessionMap sessions_;
   CdmReleaseKeySetMap release_key_sets_;