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

media/base/video_frame.h

Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 2135ae8306e5617d97d74a56901d42ff8823104b..fe37bd39281d4746e3cca02311f9b62a4690cf01 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -77,7 +77,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
 
   // CB to be called on the mailbox backing this frame when the frame is
   // destroyed.
-  typedef base::Callback<void(uint32)> ReleaseMailboxCB;
+  typedef base::Callback<void(uint32, const gpu::SyncToken&)> ReleaseMailboxCB;
 
   // Interface representing client operations on a SyncPoint, i.e. insert one in
   // the GPU Command Buffer and wait for it.
@@ -85,7 +85,8 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
    public:
     SyncPointClient() {}
     virtual uint32 InsertSyncPoint() = 0;
-    virtual void WaitSyncPoint(uint32 sync_point) = 0;
+    virtual void WaitSyncPoint(uint32 sync_point,
+                               const gpu::SyncToken& sync_token) = 0;
 
    protected:
     virtual ~SyncPointClient() {}
@@ -493,6 +494,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
 
   base::Lock release_sync_point_lock_;
   uint32 release_sync_point_;
+  gpu::SyncToken release_sync_token_;
 
   VideoFrameMetadata metadata_;