Remove extra enumeration

This is a merge of http://go/wvgerrit/13751 from the widevine
repository.

The CryptoSession had an enumeration for HDCP levels that was copied
from OEMCryptoCENC.h by hand.  Since that header is included, there is
no need to have two enumerations.

b/16303994

Change-Id: Ief16ba62163776f9ca80375f3638ef4c7770e742

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -18,18 +18,7 @@ typedef std::map<CryptoKeyId, CryptoKey*> CryptoKeyMap;
 
 class CryptoSession {
  public:
-  // This enum should be kept in sync with the values specified for
-  // HDCP capabilities in OEMCryptoCENC.h. (See comments for
-  // OEMCrypto_GetHDCPCapability)
-  typedef enum {
-    kOemCryptoHdcpNotSupported = 0,
-    kOemCryptoHdcpVersion1 = 1,
-    kOemCryptoHdcpVersion2 = 2,
-    kOemCryptoHdcpVersion2_1 = 3,
-    kOemCryptoHdcpVersion2_2 = 4,
-    kOemCryptoNoHdcpDeviceAttached = 0xff,
-  } OemCryptoHdcpVersion;
-
+  typedef OEMCrypto_HDCP_Capability HdcpCapability;
   typedef enum {
     kUsageDurationsInvalid = 0,
     kUsageDurationPlaybackNotBegun = 1,
@@ -107,8 +96,8 @@ class CryptoSession {
   virtual CdmResponseType DeleteAllUsageReports();
   virtual bool IsAntiRollbackHwPresent();
 
-  virtual bool GetHdcpCapabilities(OemCryptoHdcpVersion* current,
-                                   OemCryptoHdcpVersion* max);
+  virtual bool GetHdcpCapabilities(HdcpCapability* current,
+                                   HdcpCapability* max);
   virtual bool GetRandom(size_t data_length, uint8_t* random_data);
   virtual bool GetNumberOfOpenSessions(size_t* count);
   virtual bool GetMaxNumberOfSessions(size_t* max);