Provide callback to create mojo AndroidOverlays to AVDA.

content/gpu/gpu_child_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/gpu/gpu_child_thread.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 17 matching lines @@
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "media/base/android/media_drm_bridge_client.h"
+#include "media/mojo/clients/mojo_android_overlay.h"
 #endif
 
 namespace content {
 namespace {
 
 ChildThreadImpl::Options GetOptions() {
   ChildThreadImpl::Options::Builder builder;
 
 #if defined(USE_OZONE)
   IPC::MessageFilter* message_filter =
@@ skipping 228 matching lines @@
   gpu_service_->InitializeWithHost(
       std::move(gpu_host),
       gpu::GpuProcessActivityFlags(std::move(activity_flags)),
       sync_point_manager, ChildProcess::current()->GetShutDownEvent());
   CHECK(gpu_service_->media_gpu_channel_manager());
 
   // Only set once per process instance.
   service_factory_.reset(new GpuServiceFactory(
       gpu_service_->media_gpu_channel_manager()->AsWeakPtr()));
 
+#if defined(OS_ANDROID)
+  gpu_service_->media_gpu_channel_manager()->SetOverlayFactory(
+      base::Bind(&GpuChildThread::OverlayFactory, base::Unretained(this)));
+#endif
+
   if (GetContentClient()->gpu())  // NULL in tests.
     GetContentClient()->gpu()->GpuServiceInitialized(gpu_preferences);
 
   release_pending_requests_closure_.Run();
 }
 
 void GpuChildThread::CreateFrameSinkManager(
     cc::mojom::FrameSinkManagerRequest request,
     cc::mojom::FrameSinkManagerClientPtr client) {
   NOTREACHED();
 }
 
 void GpuChildThread::BindServiceFactoryRequest(
     const service_manager::BindSourceInfo& source_info,
     service_manager::mojom::ServiceFactoryRequest request) {
   DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest";
   DCHECK(service_factory_);
   service_factory_bindings_.AddBinding(service_factory_.get(),
                                        std::move(request));
 }
 
+#if defined(OS_ANDROID)
+std::unique_ptr<media::AndroidOverlay> GpuChildThread::OverlayFactory(
+    const base::UnguessableToken& routing_token,

[jbauman, 2017/05/12 20:57:39]

Could you make this static (so we don't need base::Unretained above)?

[liberato (no reviews please), 2017/05/12 21:10:26]

Done.

+    media::AndroidOverlayConfig config) {
+  media::mojom::AndroidOverlayProviderPtr provider_ptr;
+  ChildThread::Get()->GetConnector()->BindInterface(
+      content::mojom::kBrowserServiceName, &provider_ptr);
+  return base::MakeUnique<media::MojoAndroidOverlay>(
+      std::move(provider_ptr), std::move(config), routing_token);
+}
+#endif
+
 }  // namespace content