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

In order to help with refactoring old sync points into new sync points,
glWaitSyncPointCHROMIUM() has been changed to accept both the old and
new sync points.

This CL only refactors all the ways we pass around sync points so in
theory shouldn't change any behavior. Once this lands we can then
incrementally change the sync point insertions to the new sync points.

R=piman@chromium.org
BUG=514815
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1427543002

Cr-Commit-Position: refs/heads/master@{#357595}

1 files changed, 4 insertions, 3 deletions

diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index 795b1e6e6..261aa5b 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -47,8 +47,9 @@ struct BufferReceivedTestArg {
 
 static const BufferReceivedTestArg kBufferFormats[] = {
     BufferReceivedTestArg(media::PIXEL_FORMAT_I420),
-    BufferReceivedTestArg(media::PIXEL_FORMAT_ARGB,
-                          gpu::MailboxHolder(gpu::Mailbox::Generate(), 0, 0))};
+    BufferReceivedTestArg(
+        media::PIXEL_FORMAT_ARGB,
+        gpu::MailboxHolder(gpu::Mailbox::Generate(), gpu::SyncToken(), 0))};
 
 class VideoCaptureImplTest
     : public ::testing::TestWithParam<BufferReceivedTestArg> {
@@ -98,7 +99,7 @@ class VideoCaptureImplTest
 
     void DeviceReceiveEmptyBuffer(int device_id,
                                   int buffer_id,
-                                  uint32 sync_point,
+                                  const gpu::SyncToken& release_sync_token,
                                   double consumer_resource_utilization) {
       received_buffer_count_++;
     }