media: Add mojo MediaPermission service

content/browser/frame_host/frame_mojo_shell.cc

Index: content/browser/frame_host/frame_mojo_shell.cc
diff --git a/content/browser/frame_host/frame_mojo_shell.cc b/content/browser/frame_host/frame_mojo_shell.cc
index 3f83fada58262bfc5381ed9799dc344c7b73ee38..5e5d3741b66d9d953d7e56b5c08c80cc6ead6262 100644
--- a/content/browser/frame_host/frame_mojo_shell.cc
+++ b/content/browser/frame_host/frame_mojo_shell.cc
@@ -19,26 +19,32 @@
 
 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM)
 #include "content/browser/media/android/provision_fetcher_impl.h"
+#include "content/browser/media/media_permission_impl.h"
 #endif
 
 namespace content {
 
 namespace {
 
-void RegisterFrameMojoShellServices(ServiceRegistry* registry,
-                                    RenderFrameHost* render_frame_host) {
+void RegisterFrameMojoShellServices(
+    ServiceRegistry* registry,
+    RenderFrameHost* render_frame_host,
+    PermissionServiceContext* permission_service_context) {
 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM)
-  LOG(ERROR) << __FUNCTION__;
   registry->AddService(
       base::Bind(&ProvisionFetcherImpl::Create, render_frame_host));
+  registry->AddService(
+      base::Bind(&MediaPermissionImpl::Create, permission_service_context));
 #endif
 }
 
 }  // namespace
 
-FrameMojoShell::FrameMojoShell(RenderFrameHost* frame_host)
-    : frame_host_(frame_host) {
-}
+FrameMojoShell::FrameMojoShell(
+    RenderFrameHost* frame_host,
+    PermissionServiceContext* permission_service_context)
+    : frame_host_(frame_host),
+      permission_service_context_(permission_service_context) {}
 
 FrameMojoShell::~FrameMojoShell() {
 }
@@ -78,7 +84,8 @@ ServiceRegistryImpl* FrameMojoShell::GetServiceRegistry() {
     // TODO(rockot/xhwang): Currently all applications connected share the same
     // set of services registered in the |registry|. We may want to provide
     // different services for different apps for better isolation.
-    RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);
+    RegisterFrameMojoShellServices(service_registry_.get(), frame_host_,
+                                   permission_service_context_);
     GetContentClient()->browser()->RegisterFrameMojoShellServices(
         service_registry_.get(), frame_host_);
   }