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

Unified Diff: content/browser/service_manager/service_manager_context.cc

Issue 2900773004: media: Add experimental feature to enable Mojo CDM on desktop Chromium (Closed)
Patch Set: drop utility_process_host_impl.cc change Created 3 years, 7 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
« no previous file with comments | « content/browser/media/encrypted_media_browsertest.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index cc351b63c71f31e45de7f965741f62e31ed901d9..820d78b6d1a03344948fa70ff21698d2265b8aa7 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -373,6 +373,15 @@ ServiceManagerContext::ServiceManagerContext() {
base::ASCIIToUTF16("Video Capture Service")));
}
+#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
+ // TODO(xhwang): This is only used for test/experiment for now so it's okay
+ // to run it in an unsandboxed utility process. Fix CDM loading so that we can
+ // run it in the sandboxed utility process. See http://crbug.com/510604
+ // TODO(xhwang): Replace the service name "media" with a constant string.
+ unsandboxed_services.insert(
+ std::make_pair("media", base::ASCIIToUTF16("Media Service")));
+#endif
+
for (const auto& service : unsandboxed_services) {
packaged_services_connection_->AddServiceRequestHandler(
service.first, base::Bind(&StartServiceInUtilityProcess, service.first,
« no previous file with comments | « content/browser/media/encrypted_media_browsertest.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698