Removing gpu::SyncToken usage from video capture pipeline, part 1.

content/renderer/media/video_capture_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 96 matching lines @@
     ClientInfo();
     ClientInfo(const ClientInfo& other);
     ~ClientInfo();
     media::VideoCaptureParams params;
     VideoCaptureStateUpdateCB state_update_cb;
     VideoCaptureDeliverFrameCB deliver_frame_cb;
   };
   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)>;
 
   // VideoCaptureMessageFilter::Delegate interface implementation.
   void OnBufferCreated(base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id) override;
   void OnBufferDestroyed(int buffer_id) override;
   void OnBufferReceived(int buffer_id,
                         base::TimeDelta timestamp,
                         const base::DictionaryValue& metadata,
                         media::VideoPixelFormat pixel_format,
                         media::VideoFrame::StorageType storage_type,
                         const gfx::Size& coded_size,
                         const gfx::Rect& visible_rect) override;
   void OnDelegateAdded(int32_t device_id) override;
 
   // mojom::VideoCaptureObserver implementation.
   void OnStateChanged(mojom::VideoCaptureState state) override;
 
   // Sends an IPC message to browser process when all clients are done with the
   // buffer.
   void OnClientBufferFinished(int buffer_id,
                               const scoped_refptr<ClientBuffer>& buffer,
-                              const gpu::SyncToken& release_sync_token,
                               double consumer_resource_utilization);
 
   void StopDevice();
   void RestartCapture();
   void StartCaptureInternal();
 
   void OnDeviceSupportedFormats(
       const VideoCaptureDeviceFormatsCB& callback,
       const media::VideoCaptureFormats& supported_formats);
   void OnDeviceFormatsInUse(
       const VideoCaptureDeviceFormatsCB& callback,
       const media::VideoCaptureFormats& formats_in_use);
 
   // Tries to remove |client_id| from |clients|, returning false if not found.
   bool RemoveClient(int client_id, ClientInfoMap* clients);
 
   mojom::VideoCaptureHost* GetVideoCaptureHost();
 
   // Called (by an unknown thread) when all consumers are done with a VideoFrame
   // and its ref-count has gone to zero.  This helper function grabs the
   // RESOURCE_UTILIZATION value from the |metadata| and then runs the given
   // 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);
 
   const scoped_refptr<VideoCaptureMessageFilter> message_filter_;
   int device_id_;
   const int session_id_;
 
   mojom::VideoCaptureHostAssociatedPtr video_capture_host_;
   mojom::VideoCaptureHost* video_capture_host_for_testing_;
 
   mojo::Binding<mojom::VideoCaptureObserver> observer_binding_;
@@ skipping 24 matching lines @@
   // in |client_buffers_|.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_