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

media/base/video_frame.cc

Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index a8736de7a766936b934b471d4beff6f5134788b5..642e2bf8f165a2af8dbc7b8aa5cbe0cdf7fe596e 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -763,7 +763,7 @@ void VideoFrame::UpdateReleaseSyncPoint(SyncPointClient* client) {
   // that |mailbox_holders_release_cb_| guarantees the previous sync point
   // occurred when it waits on |release_sync_point_|.
   if (release_sync_point_)
-    client->WaitSyncPoint(release_sync_point_);
+    client->WaitSyncPoint(release_sync_point_, release_sync_token_);
   release_sync_point_ = client->InsertSyncPoint();
 }
 
@@ -874,13 +874,16 @@ VideoFrame::VideoFrame(VideoPixelFormat format,
 VideoFrame::~VideoFrame() {
   if (!mailbox_holders_release_cb_.is_null()) {
     uint32 release_sync_point;
+    gpu::SyncToken release_sync_token;
     {
       // To ensure that changes to |release_sync_point_| are visible on this
       // thread (imply a memory barrier).
       base::AutoLock locker(release_sync_point_lock_);
       release_sync_point = release_sync_point_;
+      release_sync_token = release_sync_token_;
     }
-    base::ResetAndReturn(&mailbox_holders_release_cb_).Run(release_sync_point);
+    base::ResetAndReturn(&mailbox_holders_release_cb_)
+        .Run(release_sync_point, release_sync_token);
   }
 
   for (auto& callback : done_callbacks_)