Index: content/renderer/media/cdm_session_adapter.cc |
diff --git a/content/renderer/media/cdm_session_adapter.cc b/content/renderer/media/cdm_session_adapter.cc |
index 71e347936d16c154222e20519bc3b4b256b1e0af..33c120ef3bd3d1bcdf41ef275c9fc3739cfd8592 100644 |
--- a/content/renderer/media/cdm_session_adapter.cc |
+++ b/content/renderer/media/cdm_session_adapter.cc |
@@ -20,7 +20,7 @@ COMPILE_ASSERT(kStartingSessionId > media::MediaKeys::kInvalidSessionId, |
invalid_starting_value); |
CdmSessionAdapter::CdmSessionAdapter() : |
-#if defined(OS_ANDROID) |
+#if defined(ENABLE_BROWSER_CDMS) |
cdm_id_(0), |
#endif |
weak_ptr_factory_(this) {} |
@@ -30,7 +30,7 @@ CdmSessionAdapter::~CdmSessionAdapter() {} |
bool CdmSessionAdapter::Initialize( |
#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 std::string& key_system, |
@@ -41,7 +41,7 @@ bool CdmSessionAdapter::Initialize( |
security_origin, |
#if defined(ENABLE_PEPPER_CDMS) |
create_pepper_cdm_cb, |
-#elif defined(OS_ANDROID) |
+#elif defined(ENABLE_BROWSER_CDMS) |
manager, |
&cdm_id_, |
#endif // defined(ENABLE_PEPPER_CDMS) |
@@ -96,11 +96,11 @@ media::Decryptor* CdmSessionAdapter::GetDecryptor() { |
return media_keys_->GetDecryptor(); |
} |
-#if defined(OS_ANDROID) |
+#if defined(ENABLE_BROWSER_CDMS) |
int CdmSessionAdapter::GetCdmId() const { |
return cdm_id_; |
} |
-#endif // defined(OS_ANDROID) |
+#endif // defined(ENABLE_BROWSER_CDMS) |
void CdmSessionAdapter::OnSessionCreated(uint32 session_id, |
const std::string& web_session_id) { |