Modified old wait sync point functions to also accept new sync tokens.

content/browser/renderer_host/media/video_capture_device_client.cc

Index: content/browser/renderer_host/media/video_capture_device_client.cc
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc
index de127994ee8b82053ff9dc905d90b30d0ab9f5c4..dcb4084c4fa5509209b1b310241c4bc3ad0b32ae 100644
--- a/content/browser/renderer_host/media/video_capture_device_client.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc
@@ -172,7 +172,8 @@ class VideoCaptureDeviceClient::TextureWrapHelper final
   // Recycles |memory_buffer|, deletes Image and Texture on VideoFrame release.
   void ReleaseCallback(const std::vector<GLuint>& image_ids,
                        const std::vector<GLuint>& texture_ids,
-                       uint32 sync_point);
+                       uint32 sync_point,
+                       const gpu::SyncToken& sync_token);
 
   // The Command Buffer lost the GL context, f.i. GPU process crashed. Signal
   // error to our owner so the capture can be torn down.
@@ -648,7 +649,7 @@ VideoCaptureDeviceClient::TextureWrapHelper::OnIncomingCapturedGpuMemoryBuffer(
     DCHECK(!mailbox_holder.mailbox.IsZero());
     DCHECK(mailbox_holder.mailbox.Verify());
     DCHECK(mailbox_holder.texture_target);
-    DCHECK(mailbox_holder.sync_point);
+    DCHECK(mailbox_holder.sync_point || mailbox_holder.sync_token.HasData());
     mailbox_holders.push_back(mailbox_holder);
   }
 
@@ -739,7 +740,8 @@ void VideoCaptureDeviceClient::TextureWrapHelper::CreateGlHelper(
 void VideoCaptureDeviceClient::TextureWrapHelper::ReleaseCallback(
     const std::vector<GLuint>& image_ids,
     const std::vector<GLuint>& texture_ids,
-    uint32 sync_point) {
+    uint32 sync_point,
+    const gpu::SyncToken& sync_token) {
   DCHECK(capture_task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(image_ids.size(), texture_ids.size());