Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 2380743004: media: Remove Browser CDM implementation (Closed)
Patch Set: media: Remove Browser CDM implementation Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 029baf3e2dae1e75453bc265deb805c70a1e3b69..53ef8c2b332ab182a31861f09f9bd78d6ae85d00 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -224,10 +224,6 @@
#include "ui/ozone/public/ozone_switches.h"
#endif
-#if defined(ENABLE_BROWSER_CDMS)
-#include "content/browser/media/cdm/browser_cdm_manager.h"
-#endif
-
#if defined(ENABLE_PLUGINS)
#include "content/browser/plugin_service_impl.h"
#endif
@@ -1146,9 +1142,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
// should eventually be if (!ShouldUseDirectWrite()) guarded.
channel_->AddFilter(new FontCacheDispatcher());
#endif
-#if defined(ENABLE_BROWSER_CDMS)
- AddFilter(new BrowserCdmManager(GetID(), NULL));
-#endif
message_port_message_filter_ = new MessagePortMessageFilter(
base::Bind(&RenderWidgetHelper::GetNextRoutingID,
@@ -1360,18 +1353,6 @@ const base::TimeTicks& RenderProcessHostImpl::GetInitTimeForNavigationMetrics()
return init_time_;
}
-#if defined(ENABLE_BROWSER_CDMS)
-scoped_refptr<media::MediaKeys> RenderProcessHostImpl::GetCdm(
- int render_frame_id,
- int cdm_id) const {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- BrowserCdmManager* manager = BrowserCdmManager::FromProcess(GetID());
- if (!manager)
- return nullptr;
- return manager->GetCdm(render_frame_id, cdm_id);
-}
-#endif
-
bool RenderProcessHostImpl::IsProcessBackgrounded() const {
return is_process_backgrounded_;
}

Powered by Google App Engine
This is Rietveld 408576698