Index: content/renderer/media/cdm_session_adapter.h |
diff --git a/content/renderer/media/cdm_session_adapter.h b/content/renderer/media/cdm_session_adapter.h |
index 0a3c81c69cf5d06bdcd2371c2314017ca91ae217..f79564337983ee5f859c7c8e43633d78a30b7a10 100644 |
--- a/content/renderer/media/cdm_session_adapter.h |
+++ b/content/renderer/media/cdm_session_adapter.h |
@@ -21,7 +21,7 @@ class GURL; |
namespace content { |
-#if defined(OS_ANDROID) |
+#if defined(ENABLE_BROWSER_CDMS) |
class RendererCdmManager; |
#endif |
class WebContentDecryptionModuleSessionImpl; |
@@ -38,7 +38,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> { |
bool Initialize( |
#if defined(ENABLE_PEPPER_CDMS) |
const CreatePepperCdmCB& create_pepper_cdm_cb, |
-#elif defined(OS_ANDROID) |
+#elif defined(ENABLE_BROWSER_CDMS) |
RendererCdmManager* manager, |
#endif |
const std::string& key_system, |
@@ -73,7 +73,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> { |
// after WebContentDecryptionModule is freed. http://crbug.com/330324 |
media::Decryptor* GetDecryptor(); |
-#if defined(OS_ANDROID) |
+#if defined(ENABLE_BROWSER_CDMS) |
// Returns the CDM ID associated with the |media_keys_|. May be kInvalidCdmId |
// if no CDM ID is associated. |
int GetCdmId() const; |
ddorwin
2014/06/05 17:59:48
Since this has a clear purpose now, should we name
xhwang
2014/06/09 20:57:19
I tried. Actually it looks weird when you have cod
|
@@ -106,7 +106,7 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> { |
SessionMap sessions_; |
-#if defined(OS_ANDROID) |
+#if defined(ENABLE_BROWSER_CDMS) |
int cdm_id_; |
#endif |