Send AndroidOverlay routing token from WMPI to AVDA.

media/filters/gpu_video_decoder.h

Index: media/filters/gpu_video_decoder.h
diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h
index c2a5c68a5118595bb0216d36c00b3d35a521dff3..018e925562bbdcb4a1f04e1b1ae0a1ffaac5f015 100644
--- a/media/filters/gpu_video_decoder.h
+++ b/media/filters/gpu_video_decoder.h
@@ -17,6 +17,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/common/sync_token.h"
+#include "media/base/overlay_info.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/surface_manager.h"
 #include "media/base/video_decoder.h"
@@ -47,7 +48,7 @@ class MEDIA_EXPORT GpuVideoDecoder
       public VideoDecodeAccelerator::Client {
  public:
   GpuVideoDecoder(GpuVideoAcceleratorFactories* factories,
-                  const RequestSurfaceCB& request_surface_cb,
+                  const RequestOverlayInfoCB& request_overlay_info_cb,
                   MediaLog* media_log);
   ~GpuVideoDecoder() override;
 
@@ -152,15 +153,19 @@ class MEDIA_EXPORT GpuVideoDecoder
   // Assert the contract that this class is operated on the right thread.
   void DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent() const;
 
-  // Provided to the |request_surface_cb_| callback given during construction;
-  // sets or changes the output surface.
-  void OnSurfaceAvailable(int surface_id);
+  // Provided to the |request_overlay_info_cb_| callback given during
+  // construction.  Sets or changes the output surface.
+  void OnOverlayInfoAvailable(
+      int surface_id,
+      const base::Optional<base::UnguessableToken>& routing_token);
 
   // If the VDA supports external surfaces, we must wait for the surface before
   // completing initialization. This will be called by OnSurfaceAvailable() once
   // the surface is known or immediately by Initialize() if external surfaces
   // are unsupported.
-  void CompleteInitialization(int surface_id);
+  void CompleteInitialization(
+      int surface_id,
+      const base::Optional<base::UnguessableToken>& token);
 
   bool needs_bitstream_conversion_;
 
@@ -168,7 +173,7 @@ class MEDIA_EXPORT GpuVideoDecoder
 
   // For requesting a suface to render to. If this is null the VDA will return
   // normal video frames and not render them to a surface.
-  RequestSurfaceCB request_surface_cb_;
+  RequestOverlayInfoCB request_overlay_info_cb_;
 
   MediaLog* media_log_;