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

content/renderer/media/video_capture_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 30 matching lines @@
   BufferReceivedTestArg(media::VideoPixelFormat pixel_format)
       : pixel_format(pixel_format) {}
 
   media::VideoPixelFormat pixel_format;
   gpu::MailboxHolder mailbox_holder;
 };
 
 static const BufferReceivedTestArg kBufferFormats[] = {
     BufferReceivedTestArg(media::PIXEL_FORMAT_I420),
     BufferReceivedTestArg(media::PIXEL_FORMAT_ARGB,
-                          gpu::MailboxHolder(gpu::Mailbox::Generate(), 0, 0))};
+                          gpu::MailboxHolder(gpu::Mailbox::Generate(),
+                                             gpu::SyncToken(),
+                                             0))};
 
 class VideoCaptureImplTest
     : public ::testing::TestWithParam<BufferReceivedTestArg> {
  public:
   class MockVideoCaptureImpl : public VideoCaptureImpl {
    public:
     MockVideoCaptureImpl(const media::VideoCaptureSessionId id,
                          VideoCaptureMessageFilter* filter)
         : VideoCaptureImpl(id, filter), received_buffer_count_(0) {}
     ~MockVideoCaptureImpl() override {}
@@ skipping 29 matching lines @@
     }
 
     void DevicePauseCapture(int device_id) {}
 
     void DeviceStopCapture(int device_id) {
       OnStateChanged(VIDEO_CAPTURE_STATE_STOPPED);
     }
 
     void DeviceReceiveEmptyBuffer(int device_id,
                                   int buffer_id,
-                                  uint32 sync_point,
+                                  const gpu::SyncToken& release_sync_token,
                                   double consumer_resource_utilization) {
       received_buffer_count_++;
     }
 
     void DeviceGetSupportedFormats(int device_id,
                                    media::VideoCaptureSessionId session_id) {
       // When the mock message filter receives a request for the device
       // supported formats, replies immediately with an empty format list.
       OnDeviceSupportedFormatsEnumerated(media::VideoCaptureFormats());
     }
@@ skipping 286 matching lines @@
    StartCapture(0, params_small_);
 
    // Receive state change message from browser.
    video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ERROR);
 
    StopCapture(0);
    DeInit();
 }
 
 }  // namespace content