| Index: content/renderer/media/crypto/proxy_decryptor.h
|
| diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h
|
| index 668d81f4be85237f604f384a98ffbefc7140a1b7..81cb09455b9b8a214a92459c93eb330aeb3da5b9 100644
|
| --- a/content/renderer/media/crypto/proxy_decryptor.h
|
| +++ b/content/renderer/media/crypto/proxy_decryptor.h
|
| @@ -25,9 +25,9 @@ class GURL;
|
|
|
| namespace content {
|
|
|
| -#if defined(OS_ANDROID)
|
| +#if defined(ENABLE_BROWSER_CDMS)
|
| class RendererCdmManager;
|
| -#endif // defined(OS_ANDROID)
|
| +#endif // defined(ENABLE_BROWSER_CDMS)
|
|
|
| // ProxyDecryptor is for EME v0.1b only. It should not be used for the WD API.
|
| // A decryptor proxy that creates a real decryptor object on demand and
|
| @@ -57,7 +57,7 @@ class ProxyDecryptor {
|
| ProxyDecryptor(
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| const CreatePepperCdmCB& create_pepper_cdm_cb,
|
| -#elif defined(OS_ANDROID)
|
| +#elif defined(ENABLE_BROWSER_CDMS)
|
| RendererCdmManager* manager,
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
| const KeyAddedCB& key_added_cb,
|
| @@ -69,7 +69,7 @@ class ProxyDecryptor {
|
| // Decryptor is associated.
|
| media::Decryptor* GetDecryptor();
|
|
|
| -#if defined(OS_ANDROID)
|
| +#if defined(ENABLE_BROWSER_CDMS)
|
| // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
|
| // CDM ID is associated, such as when Clear Key is used.
|
| int GetCdmId();
|
| @@ -118,7 +118,7 @@ class ProxyDecryptor {
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| // Callback to create the Pepper plugin.
|
| CreatePepperCdmCB create_pepper_cdm_cb_;
|
| -#elif defined(OS_ANDROID)
|
| +#elif defined(ENABLE_BROWSER_CDMS)
|
| RendererCdmManager* manager_;
|
| int cdm_id_;
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|