Cleanup of passing GpuMemoryBuffer backed video frames

media/base/video_frame.h

Index: media/base/video_frame.h
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 468df18802069010df4687e31a2d53500cd555e6..7ed1162b7a4147956f0d01d95c971ce7bbf4a0ab 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -24,7 +24,6 @@
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/gpu_memory_buffer.h"
 
 #if defined(OS_MACOSX)
 #include <CoreVideo/CVPixelBuffer.h>
@@ -68,8 +67,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
     // meaningful name and handle it appropriately in all cases.
     STORAGE_DMABUFS = 5,  // Each plane is stored into a DmaBuf.
 #endif
-    STORAGE_GPU_MEMORY_BUFFERS = 6,
-    STORAGE_MOJO_SHARED_BUFFER = 7,
+    STORAGE_MOJO_SHARED_BUFFER = 6,
     STORAGE_LAST = STORAGE_MOJO_SHARED_BUFFER,
   };
 
@@ -171,24 +169,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
       uint8_t* v_data,
       base::TimeDelta timestamp);
 
-  // Wraps external YUV data with the given parameters with a VideoFrame.
-  // The returned VideoFrame does not own the GpuMemoryBuffers passed in.
-  static scoped_refptr<VideoFrame> WrapExternalYuvGpuMemoryBuffers(
-      VideoPixelFormat format,
-      const gfx::Size& coded_size,
-      const gfx::Rect& visible_rect,
-      const gfx::Size& natural_size,
-      int32_t y_stride,
-      int32_t u_stride,
-      int32_t v_stride,
-      uint8_t* y_data,
-      uint8_t* u_data,
-      uint8_t* v_data,
-      const gfx::GpuMemoryBufferHandle& y_handle,
-      const gfx::GpuMemoryBufferHandle& u_handle,
-      const gfx::GpuMemoryBufferHandle& v_handle,
-      base::TimeDelta timestamp);
-
   // Wraps external YUVA data of the given parameters with a VideoFrame.
   // The returned VideoFrame does not own the data passed in.
   static scoped_refptr<VideoFrame> WrapExternalYuvaData(
@@ -356,10 +336,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
   // Returns the offset into the shared memory where the frame data begins.
   size_t shared_memory_offset() const;
 
-  // Returns the vector of GpuMemoryBuffer handles, if present.
-  const std::vector<gfx::GpuMemoryBufferHandle>& gpu_memory_buffer_handles()
-      const;
-
 #if defined(OS_LINUX)
   // Returns backing DmaBuf file descriptor for given |plane|, if present, or
   // -1 if not.
@@ -543,9 +519,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
   base::SharedMemoryHandle shared_memory_handle_;
   size_t shared_memory_offset_;
 
-  // GpuMemoryBuffer handles attached to the video_frame.
-  std::vector<gfx::GpuMemoryBufferHandle> gpu_memory_buffer_handles_;
-
 #if defined(OS_LINUX)
   // Dmabufs for each plane. If set, this frame has DmaBuf backing in some way.
   base::ScopedFD dmabuf_fds_[kMaxPlanes];