media: Pass MediaPermission to MediaDrmBridge

content/gpu/gpu_process_control_impl.cc

Index: content/gpu/gpu_process_control_impl.cc
diff --git a/content/gpu/gpu_process_control_impl.cc b/content/gpu/gpu_process_control_impl.cc
index f281b05cfbfd90d101d933ff6460584f97616eb8..5aece9163e962dc695762e707fe878a3ffccfb55 100644
--- a/content/gpu/gpu_process_control_impl.cc
+++ b/content/gpu/gpu_process_control_impl.cc
@@ -12,16 +12,24 @@
 
 namespace content {
 
-GpuProcessControlImpl::GpuProcessControlImpl() {}
+GpuProcessControlImpl::GpuProcessControlImpl(
+    media::MediaPermission* media_permission)
+    : media_permission_(media_permission) {}
 
 GpuProcessControlImpl::~GpuProcessControlImpl() {}
 
 void GpuProcessControlImpl::RegisterApplicationFactories(
     ApplicationFactoryMap* factories) {
 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+#if defined(OS_ANDROID)
+  factories->insert(std::make_pair(
+      "mojo:media", base::Bind(&media::CreateAndroidMojoMediaApplication,
+                               media_permission_)));
+#else
   factories->insert(std::make_pair(
       "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
 #endif
+#endif
 }
 
 }  // namespace content