Index: content/renderer/media/cdm/render_cdm_factory.cc |
diff --git a/content/renderer/media/cdm/render_cdm_factory.cc b/content/renderer/media/cdm/render_cdm_factory.cc |
index e461d0a4ee941b3726d24e84dd971d75ac6a84d6..fb2335ede14249d05b7d8b510d1f0cb107e6cef4 100644 |
--- a/content/renderer/media/cdm/render_cdm_factory.cc |
+++ b/content/renderer/media/cdm/render_cdm_factory.cc |
@@ -19,8 +19,6 @@ |
#include "url/gurl.h" |
#if defined(ENABLE_PEPPER_CDMS) |
#include "content/renderer/media/cdm/ppapi_decryptor.h" |
-#elif defined(ENABLE_BROWSER_CDMS) |
-#include "content/renderer/media/cdm/proxy_media_keys.h" |
#endif // defined(ENABLE_PEPPER_CDMS) |
namespace content { |
@@ -29,9 +27,6 @@ namespace content { |
RenderCdmFactory::RenderCdmFactory( |
const CreatePepperCdmCB& create_pepper_cdm_cb) |
: create_pepper_cdm_cb_(create_pepper_cdm_cb) {} |
-#elif defined(ENABLE_BROWSER_CDMS) |
-RenderCdmFactory::RenderCdmFactory(RendererCdmManager* manager) |
- : manager_(manager) {} |
#else |
RenderCdmFactory::RenderCdmFactory() {} |
#endif // defined(ENABLE_PEPPER_CDMS) |
@@ -75,13 +70,6 @@ void RenderCdmFactory::Create( |
cdm_config.allow_persistent_state, create_pepper_cdm_cb_, |
session_message_cb, session_closed_cb, session_keys_change_cb, |
session_expiration_update_cb, cdm_created_cb); |
-#elif defined(ENABLE_BROWSER_CDMS) |
- DCHECK(cdm_config.allow_distinctive_identifier); |
- DCHECK(cdm_config.allow_persistent_state); |
- ProxyMediaKeys::Create( |
- key_system, security_origin, cdm_config.use_hw_secure_codecs, manager_, |
- session_message_cb, session_closed_cb, session_keys_change_cb, |
- session_expiration_update_cb, cdm_created_cb); |
#else |
// No possible CDM to create, so fail the request. |
base::ThreadTaskRunnerHandle::Get()->PostTask( |