Send AndroidOverlay routing token from WMPI to AVDA.

media/renderers/default_renderer_factory.cc

Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index 9d61092439cb3419169c5e1d6b9c01b28d577606..9cbb0738f6e3e621236d9953e65da9a86b6cfe91 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -62,7 +62,7 @@ ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders(
 
 ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
-    const RequestSurfaceCB& request_surface_cb,
+    const RequestOverlayInfoCB& request_overlay_info_cb,
     GpuVideoAcceleratorFactories* gpu_factories) {
   // Create our video decoders and renderer.
   ScopedVector<VideoDecoder> video_decoders;
@@ -79,8 +79,8 @@ ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
       decoder_factory_->CreateVideoDecoders(media_task_runner, gpu_factories,
                                             &video_decoders);
     }
-    video_decoders.push_back(
-        new GpuVideoDecoder(gpu_factories, request_surface_cb, media_log_));
+    video_decoders.push_back(new GpuVideoDecoder(
+        gpu_factories, request_overlay_info_cb, media_log_));
   }
 
 #if !defined(MEDIA_DISABLE_LIBVPX)
@@ -99,7 +99,7 @@ std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
     const scoped_refptr<base::TaskRunner>& worker_task_runner,
     AudioRendererSink* audio_renderer_sink,
     VideoRendererSink* video_renderer_sink,
-    const RequestSurfaceCB& request_surface_cb) {
+    const RequestOverlayInfoCB& request_overlay_info_cb) {
   DCHECK(audio_renderer_sink);
 
   std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
@@ -127,8 +127,8 @@ std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
       // RendererFactory is owned by WMPI and gets called after WMPI destructor
       // finishes.
       base::Bind(&DefaultRendererFactory::CreateVideoDecoders,
-                 base::Unretained(this), media_task_runner, request_surface_cb,
-                 gpu_factories),
+                 base::Unretained(this), media_task_runner,
+                 request_overlay_info_cb, gpu_factories),
       true, gpu_factories, media_log_));
 
   return base::MakeUnique<RendererImpl>(