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

content/browser/media/capture/aura_window_capture_machine.cc

Index: content/browser/media/capture/aura_window_capture_machine.cc
diff --git a/content/browser/media/capture/aura_window_capture_machine.cc b/content/browser/media/capture/aura_window_capture_machine.cc
index e5019f7d2af1a9a36d62a3c69ae57da733cf2c43..92424a9c452c8659d5170f2b8f703dcb912daf4a 100644
--- a/content/browser/media/capture/aura_window_capture_machine.cc
+++ b/content/browser/media/capture/aura_window_capture_machine.cc
@@ -107,7 +107,7 @@ void CopyOutputFinishedForVideo(
 
   if (!cursor_bitmap.isNull())
     RenderCursorOnVideoFrame(target, cursor_bitmap, cursor_position);
-  release_callback->Run(0, false);
+  release_callback->Run(0, gpu::SyncToken(), false);
 
   // Only deliver the captured frame if the AuraWindowCaptureMachine has not
   // been stopped (i.e., the WeakPtr is still valid).
@@ -116,8 +116,9 @@ void CopyOutputFinishedForVideo(
 }
 
 void RunSingleReleaseCallback(scoped_ptr<cc::SingleReleaseCallback> cb,
-                              uint32 sync_point) {
-  cb->Run(sync_point, false);
+                              uint32 sync_point,
+                              const gpu::SyncToken& sync_token) {
+  cb->Run(sync_point, sync_token, false);
 }
 
 }  // namespace
@@ -335,8 +336,9 @@ bool AuraWindowCaptureMachine::ProcessCopyOutputResponse(
       return false;
     video_frame = media::VideoFrame::WrapNativeTexture(
         media::PIXEL_FORMAT_ARGB,
-        gpu::MailboxHolder(texture_mailbox.mailbox(), texture_mailbox.target(),
-                           texture_mailbox.sync_point()),
+        gpu::MailboxHolder(
+            texture_mailbox.mailbox(), texture_mailbox.sync_point(),
+            texture_mailbox.sync_token(), texture_mailbox.target()),
         base::Bind(&RunSingleReleaseCallback, base::Passed(&release_callback)),
         result->size(), gfx::Rect(result->size()), result->size(),
         base::TimeDelta());
@@ -389,17 +391,11 @@ bool AuraWindowCaptureMachine::ProcessCopyOutputResponse(
 
   gfx::Point cursor_position_in_frame = UpdateCursorState(region_in_frame);
   yuv_readback_pipeline_->ReadbackYUV(
-      texture_mailbox.mailbox(),
-      texture_mailbox.sync_point(),
-      video_frame.get(),
-      region_in_frame.origin(),
-      base::Bind(&CopyOutputFinishedForVideo,
-                 weak_factory_.GetWeakPtr(),
-                 start_time,
-                 capture_frame_cb,
-                 video_frame,
-                 scaled_cursor_bitmap_,
-                 cursor_position_in_frame,
+      texture_mailbox.mailbox(), texture_mailbox.sync_point(),
+      texture_mailbox.sync_token(), video_frame.get(), region_in_frame.origin(),
+      base::Bind(&CopyOutputFinishedForVideo, weak_factory_.GetWeakPtr(),
+                 start_time, capture_frame_cb, video_frame,
+                 scaled_cursor_bitmap_, cursor_position_in_frame,
                  base::Passed(&release_callback)));
   return true;
 }