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

content/common/gpu/client/gl_helper.h

Index: content/common/gpu/client/gl_helper.h
diff --git a/content/common/gpu/client/gl_helper.h b/content/common/gpu/client/gl_helper.h
index 26ec2174a3a8f83472ede59670b25d41de80817d..6cce5b7f27d23b960eeb2db34b7c5ee5f92d050e 100644
--- a/content/common/gpu/client/gl_helper.h
+++ b/content/common/gpu/client/gl_helper.h
@@ -189,6 +189,7 @@ class CONTENT_EXPORT GLHelper {
   void CropScaleReadbackAndCleanMailbox(
       const gpu::Mailbox& src_mailbox,
       uint32 sync_point,
+      const gpu::SyncToken& sync_token,
       const gfx::Size& src_size,
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
@@ -247,7 +248,7 @@ class CONTENT_EXPORT GLHelper {
   // Insert a sync point into the GL command buffer.
   uint32 InsertSyncPoint();
   // Wait for the sync point before executing further GL commands.
-  void WaitSyncPoint(uint32 sync_point);
+  void WaitSyncPoint(uint32 sync_point, const gpu::SyncToken& sync_token);
 
   // Creates a mailbox holder that is attached to the given texture id, with a
   // sync point to wait on before using the mailbox. Returns a holder with an
@@ -258,7 +259,8 @@ class CONTENT_EXPORT GLHelper {
   // Creates a texture and consumes a mailbox into it. Returns 0 on failure.
   // Note the mailbox is assumed to be GL_TEXTURE_2D.
   GLuint ConsumeMailboxToTexture(const gpu::Mailbox& mailbox,
-                                 uint32 sync_point);
+                                 uint32 sync_point,
+                                 const gpu::SyncToken& sync_token);
 
   // Resizes the texture's size to |size|.
   void ResizeTexture(GLuint texture, const gfx::Size& size);
@@ -370,6 +372,7 @@ class CONTENT_EXPORT ReadbackYUVInterface {
   // |target->visible_rect()|.
   virtual void ReadbackYUV(const gpu::Mailbox& mailbox,
                            uint32 sync_point,
+                           const gpu::SyncToken& sync_token,
                            const scoped_refptr<media::VideoFrame>& target,
                            const gfx::Point& paste_location,
                            const base::Callback<void(bool)>& callback) = 0;