Send AndroidOverlay routing token from WMPI to AVDA.

chromecast/media/service/cast_mojo_media_client.cc

 // Copyright 2016 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 "chromecast/media/service/cast_mojo_media_client.h"
 
 #include "base/memory/ptr_util.h"
 #include "chromecast/media/cma/backend/media_pipeline_backend_factory.h"
 #include "chromecast/media/service/cast_renderer.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/media_log.h"
+#include "media/base/overlay_info.h"
 #include "media/base/renderer_factory.h"
 
 namespace chromecast {
 namespace media {
 
 namespace {
 // CastRenderer does not use a ::media::AudioRendererSink.
 // CastAudioRendererSink is only used to hold audio-device-id.
 class CastAudioRendererSink : public ::media::AudioRendererSink {
  public:
@@ skipping 40 matching lines @@
         video_mode_switcher_(video_mode_switcher),
         video_resolution_policy_(video_resolution_policy),
         media_resource_tracker_(media_resource_tracker) {}
   ~CastRendererFactory() final {}
 
   std::unique_ptr<::media::Renderer> CreateRenderer(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
       const scoped_refptr<base::TaskRunner>& worker_task_runner,
       ::media::AudioRendererSink* audio_renderer_sink,
       ::media::VideoRendererSink* video_renderer_sink,
-      const ::media::RequestSurfaceCB& request_surface_cb) final {
+      const ::media::RequestOverlayInfoCB& request_overlay_info_cb) final {
     DCHECK(audio_renderer_sink);
     DCHECK(!video_renderer_sink);
     return base::MakeUnique<CastRenderer>(
         backend_factory_, media_task_runner,
         audio_renderer_sink->GetOutputDeviceInfo().device_id(),
         video_mode_switcher_, video_resolution_policy_,
         media_resource_tracker_);
   }
 
  private:
@@ skipping 41 matching lines @@
       media_resource_tracker_);
 }
 
 std::unique_ptr<::media::CdmFactory> CastMojoMediaClient::CreateCdmFactory(
     service_manager::mojom::InterfaceProvider* /* host_interfaces */) {
   return create_cdm_factory_cb_.Run();
 }
 
 }  // namespace media
 }  // namespace chromecast