Send AndroidOverlay routing token from WMPI to AVDA.

media/gpu/ipc/common/media_messages.h

 // 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.
 
 // Multiply-included message file, hence no include guard here, but see below
 // for a much smaller-than-usual include guard section.
 
 #include <stdint.h>
 
 #include "base/unguessable_token.h"
@@ skipping 75 matching lines @@
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_ReusePictureBuffer,
                     int32_t) /* Picture buffer ID */
 
 // Send flush request to the decoder.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Flush)
 
 // Send reset request to the decoder.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Reset)
 
 // Send a surface id to the decoder.
-IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderMsg_SetSurface,
-                    int32_t) /* Surface ID */
+IPC_MESSAGE_ROUTED2(
+    AcceleratedVideoDecoderMsg_SetSurface,
+    int32_t,                                 /* Surface ID */
+    base::Optional<base::UnguessableToken>); /* AndroidOverlay routing token */
 
 // Send destroy request to the decoder.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderMsg_Destroy)
 
 //------------------------------------------------------------------------------
 // Accelerated Video Decoder Host Messages
 // These messages are sent from GPU process to Renderer process.
 // Inform AcceleratedVideoDecoderHost that AcceleratedVideoDecoder has been
 // created.
 
@@ skipping 114 matching lines @@
 IPC_MESSAGE_ROUTED0(AcceleratedJpegDecoderMsg_Destroy)
 
 //------------------------------------------------------------------------------
 // Accelerated JPEG Decoder Host Messages
 // These messages are sent from the GPU process to Browser process.
 //
 // Report decode status.
 IPC_MESSAGE_ROUTED2(AcceleratedJpegDecoderHostMsg_DecodeAck,
                     int32_t, /* bitstream_buffer_id */
                     media::JpegDecodeAccelerator::Error /* error */)