Send AndroidOverlay routing token from WMPI to AVDA.

media/gpu/android_video_decode_accelerator.cc

Index: media/gpu/android_video_decode_accelerator.cc
diff --git a/media/gpu/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
index 90e1abdfdcd03e368b5d715c2d7cd61d083223ea..a591adf04a980bfeae8cc5ba8ddc922a4161e5f2 100644
--- a/media/gpu/android_video_decode_accelerator.cc
+++ b/media/gpu/android_video_decode_accelerator.cc
@@ -1238,7 +1238,9 @@ void AndroidVideoDecodeAccelerator::Reset() {
   StartCodecDrain(DRAIN_FOR_RESET);
 }
 
-void AndroidVideoDecodeAccelerator::SetSurface(int32_t surface_id) {
+void AndroidVideoDecodeAccelerator::SetSurface(
+    int32_t surface_id,
+    const base::Optional<base::UnguessableToken>& routing_token) {
   DVLOG(1) << __func__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -1252,8 +1254,11 @@ void AndroidVideoDecodeAccelerator::SetSurface(int32_t surface_id) {
   }
 
   AndroidOverlayFactoryCB factory;
-  if (surface_id != SurfaceManager::kNoSurfaceID)
+  if (routing_token) {
+    // TODO(liberato): do something
+  } else if (surface_id != SurfaceManager::kNoSurfaceID) {
     factory = base::Bind(&CreateContentVideoViewOverlay, surface_id);
+  }
 
   surface_chooser_->ReplaceOverlayFactory(std::move(factory));
 }