media: Set MediaClientAndroid in the GPU process.

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..95e3fcaffbed64d113d74d5a1e36eeb5e6e97950 100644
--- a/content/gpu/gpu_process_control_impl.cc
+++ b/content/gpu/gpu_process_control_impl.cc
@@ -7,6 +7,8 @@
 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "content/public/common/content_client.h"
+#include "media/base/android/media_client_android.h"
 #include "media/mojo/services/mojo_media_application_factory.h"
 #endif
 
@@ -19,6 +21,9 @@ GpuProcessControlImpl::~GpuProcessControlImpl() {}
 void GpuProcessControlImpl::RegisterApplicationFactories(
     ApplicationFactoryMap* factories) {
 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+  if (!media::GetMediaClientAndroid())
+    media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
+
   factories->insert(std::make_pair(
       "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
 #endif