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 b6a7824fa83f12e98253fb7ee8ce64a63b0adb56..2410d1b335480967e0b87fed193be9c76edbc360 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -64,7 +64,7 @@ DefaultRendererFactory::CreateAudioDecoders(
 std::vector<std::unique_ptr<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.
   std::vector<std::unique_ptr<VideoDecoder>> video_decoders;
@@ -82,7 +82,7 @@ DefaultRendererFactory::CreateVideoDecoders(
                                             &video_decoders);
     }
     video_decoders.push_back(base::MakeUnique<GpuVideoDecoder>(
-        gpu_factories, request_surface_cb, media_log_));
+        gpu_factories, request_overlay_info_cb, media_log_));
   }
 
 #if !defined(MEDIA_DISABLE_LIBVPX)
@@ -101,7 +101,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(
@@ -129,8 +129,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>(