Cleanup of passing GpuMemoryBuffer backed video frames

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 80 matching lines @@
   // Note: Overridden only by unit test subclasses.
   virtual void Send(IPC::Message* message);
 
  private:
   friend class VideoCaptureImplTest;
   friend class MockVideoCaptureImpl;
 
   // Carries a shared memory for transferring video frames from browser to
   // renderer.
   class ClientBuffer;
-  class ClientBuffer2;
 
   // Contains information for a video capture client. Including parameters
   // for capturing and callbacks to the client.
   struct ClientInfo {
     ClientInfo();
     ClientInfo(const ClientInfo& other);
     ~ClientInfo();
     media::VideoCaptureParams params;
     VideoCaptureStateUpdateCB state_update_cb;
     VideoCaptureDeliverFrameCB deliver_frame_cb;
   };
   typedef std::map<int, ClientInfo> ClientInfoMap;
 
   typedef base::Callback<void(const gpu::SyncToken& sync_token,
                               double consumer_resource_utilization)>
       BufferFinishedCallback;
 
   // VideoCaptureMessageFilter::Delegate interface.
   void OnBufferCreated(base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id) override;
-  void OnBufferCreated2(const std::vector<gfx::GpuMemoryBufferHandle>& handles,
-                        const gfx::Size& size,
-                        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 OnStateChanged(VideoCaptureState state) override;
   void OnDelegateAdded(int32_t device_id) 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 OnClientBufferFinished2(int buffer_id,
-                               const scoped_refptr<ClientBuffer2>& 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,
@@ skipping 16 matching lines @@
   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_;
 
   // Buffers available for sending to the client.
   typedef std::map<int32_t, scoped_refptr<ClientBuffer>> ClientBufferMap;
   ClientBufferMap client_buffers_;
-  typedef std::map<int32_t, scoped_refptr<ClientBuffer2>> ClientBuffer2Map;
-  ClientBuffer2Map client_buffer2s_;
 
   ClientInfoMap clients_;
   ClientInfoMap clients_pending_on_filter_;
   ClientInfoMap clients_pending_on_restart_;
 
   // Member params_ represents the video format requested by the
   // client to this class via StartCapture().
   media::VideoCaptureParams params_;
 
   // The device's first captured frame reference time sent from browser process
@@ skipping 10 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_