Rebase of Removing gpu::SyncToken usage from video capture pipeline

content/renderer/media/video_capture_impl.h

Index: content/renderer/media/video_capture_impl.h
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h
index f875e715e653a648370cda45d48a252f5a5b2cb8..b39b99911e406d97ebc5d50abeefa9936b89fb44 100644
--- a/content/renderer/media/video_capture_impl.h
+++ b/content/renderer/media/video_capture_impl.h
@@ -80,8 +80,7 @@ class CONTENT_EXPORT VideoCaptureImpl : public mojom::VideoCaptureObserver {
   using ClientInfoMap = std::map<int, ClientInfo>;
 
   using BufferFinishedCallback =
-      base::Callback<void(const gpu::SyncToken& sync_token,
-                          double consumer_resource_utilization)>;
+      base::Callback<void(double consumer_resource_utilization)>;
 
   // mojom::VideoCaptureObserver implementation.
   void OnStateChanged(mojom::VideoCaptureState state) override;
@@ -95,7 +94,6 @@ class CONTENT_EXPORT VideoCaptureImpl : public mojom::VideoCaptureObserver {
   // buffer.
   void OnClientBufferFinished(int buffer_id,
                               const scoped_refptr<ClientBuffer>& buffer,
-                              const gpu::SyncToken& release_sync_token,
                               double consumer_resource_utilization);
 
   void StopDevice();
@@ -120,7 +118,6 @@ class CONTENT_EXPORT VideoCaptureImpl : public mojom::VideoCaptureObserver {
   // callback, to trampoline back to the IO thread with the values.
   static void DidFinishConsumingFrame(
       const media::VideoFrameMetadata* metadata,
-      std::unique_ptr<gpu::SyncToken> release_sync_token,
       const BufferFinishedCallback& callback_to_io_thread);
 
   // |device_id_| and |session_id_| are different concepts, but we reuse the