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

media/renderers/skcanvas_video_renderer.cc

Index: media/renderers/skcanvas_video_renderer.cc
diff --git a/media/renderers/skcanvas_video_renderer.cc b/media/renderers/skcanvas_video_renderer.cc
index 7863a0d02e849dd37f966291df238755fdca696a..8d1370c18379d7211129fb8e3097966ae2e44d73 100644
--- a/media/renderers/skcanvas_video_renderer.cc
+++ b/media/renderers/skcanvas_video_renderer.cc
@@ -63,8 +63,9 @@ class SyncPointClientImpl : public VideoFrame::SyncPointClient {
   explicit SyncPointClientImpl(gpu::gles2::GLES2Interface* gl) : gl_(gl) {}
   ~SyncPointClientImpl() override {}
   uint32 InsertSyncPoint() override { return gl_->InsertSyncPointCHROMIUM(); }
-  void WaitSyncPoint(uint32 sync_point) override {
-    gl_->WaitSyncPointCHROMIUM(sync_point);
+  void WaitSyncPoint(uint32 sync_point,
+                     const gpu::SyncToken& sync_token) override {
+    gl_->WaitSyncPointCHROMIUM(sync_point, sync_token.GetConstData());
   }
 
  private:
@@ -95,7 +96,8 @@ skia::RefPtr<SkImage> NewSkImageFromVideoFrameYUVTextures(
     DCHECK(mailbox_holder.texture_target == GL_TEXTURE_2D ||
            mailbox_holder.texture_target == GL_TEXTURE_EXTERNAL_OES ||
            mailbox_holder.texture_target == GL_TEXTURE_RECTANGLE_ARB);
-    gl->WaitSyncPointCHROMIUM(mailbox_holder.sync_point);
+    gl->WaitSyncPointCHROMIUM(mailbox_holder.sync_point,
+                              mailbox_holder.sync_token.GetConstData());
     source_textures[i] = gl->CreateAndConsumeTextureCHROMIUM(
         mailbox_holder.texture_target, mailbox_holder.mailbox.name);
 
@@ -164,7 +166,8 @@ skia::RefPtr<SkImage> NewSkImageFromVideoFrameNative(
         gl, video_frame, source_texture, GL_RGBA, GL_UNSIGNED_BYTE, true,
         false);
   } else {
-    gl->WaitSyncPointCHROMIUM(mailbox_holder.sync_point);
+    gl->WaitSyncPointCHROMIUM(mailbox_holder.sync_point,
+                              mailbox_holder.sync_token.GetConstData());
     source_texture = gl->CreateAndConsumeTextureCHROMIUM(
         mailbox_holder.texture_target, mailbox_holder.mailbox.name);
   }
@@ -551,7 +554,8 @@ void SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture(
          mailbox_holder.texture_target == GL_TEXTURE_EXTERNAL_OES)
       << mailbox_holder.texture_target;
 
-  gl->WaitSyncPointCHROMIUM(mailbox_holder.sync_point);
+  gl->WaitSyncPointCHROMIUM(mailbox_holder.sync_point,
+                            mailbox_holder.sync_token.GetConstData());
   uint32 source_texture = gl->CreateAndConsumeTextureCHROMIUM(
       mailbox_holder.texture_target, mailbox_holder.mailbox.name);