VideoCaptureDevice::Client::Buffer remove GetType() and changes signature of AsPlatformFile()

VideoCaptureDevice::Client::Buffer::GetType() is only
used twice, once for a DCHECK, violates layering and
is marked for deprecation, so this patch says Adios to
it.

AsPlatformFile() signature changes to return only for
OS_POSIX and a base::FileDescriptor, so the |fd|s can
be used for DuplicateFileDescriptors().

BUG=440843
TEST= All captures working exactly the same.

Review URL: https://codereview.chromium.org/1178013006

Cr-Commit-Position: refs/heads/master@{#335139}

5 files changed, 11 insertions, 14 deletions

diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 5d0e46d..2aaf132 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -635,7 +635,8 @@ VideoFrame::VideoFrame(Format format,
                  natural_size,
                  timestamp) {
   DCHECK_EQ(storage_type, STORAGE_SHMEM);
-  AddSharedMemoryHandle(handle, shared_memory_offset);
+  AddSharedMemoryHandle(handle);
+  shared_memory_offset_ = shared_memory_offset;
 }
 
 VideoFrame::VideoFrame(Format format,
@@ -881,11 +882,9 @@ bool VideoFrame::DuplicateFileDescriptors(const std::vector<int>& in_fds) {
 }
 #endif
 
-void VideoFrame::AddSharedMemoryHandle(base::SharedMemoryHandle handle,
-                                       size_t shared_memory_offset) {
+void VideoFrame::AddSharedMemoryHandle(base::SharedMemoryHandle handle) {
   storage_type_ = STORAGE_SHMEM;
   shared_memory_handle_ = handle;
-  shared_memory_offset_ = shared_memory_offset;
 }
 
 #if defined(OS_MACOSX)
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index 1eaf4c3..9d97848 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -349,8 +349,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
   bool DuplicateFileDescriptors(const std::vector<int>& fds_in);
 #endif
 
-  void AddSharedMemoryHandle(base::SharedMemoryHandle handle,
-                             size_t shared_memory_offset);
+  void AddSharedMemoryHandle(base::SharedMemoryHandle handle);
 
 #if defined(OS_MACOSX)
   // Returns the backing CVPixelBuffer, if present.
diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc
index 613d8a5..e7b90ad 100644
--- a/media/video/capture/fake_video_capture_device.cc
+++ b/media/video/capture/fake_video_capture_device.cc
@@ -179,7 +179,6 @@ void FakeVideoCaptureDevice::CaptureUsingClientBuffers(
   if (capture_buffer.get()) {
     uint8_t* const data_ptr = static_cast<uint8_t*>(capture_buffer->data());
     DCHECK(data_ptr) << "Buffer has NO backing memory";
-    DCHECK_EQ(capture_buffer->GetType(), gfx::SHARED_MEMORY_BUFFER);
     memset(data_ptr, 0, capture_buffer->size());
 
     DrawPacman(
diff --git a/media/video/capture/fake_video_capture_device_unittest.cc b/media/video/capture/fake_video_capture_device_unittest.cc
index ee0c2af..ab2e7d2 100644
--- a/media/video/capture/fake_video_capture_device_unittest.cc
+++ b/media/video/capture/fake_video_capture_device_unittest.cc
@@ -39,13 +39,12 @@ class MockBuffer : public VideoCaptureDevice::Client::Buffer {
   int id() const override { return id_; }
   size_t size() const override { return size_; }
   void* data() override { return data_; }
-  gfx::GpuMemoryBufferType GetType() override {
-    return gfx::SHARED_MEMORY_BUFFER;
-  }
   ClientBuffer AsClientBuffer() override { return nullptr; }
-  base::PlatformFile AsPlatformFile() override {
-    return base::PlatformFile();
+#if defined(OS_POSIX)
+  base::FileDescriptor AsPlatformFile() override {
+    return base::FileDescriptor();
   }
+#endif
 
  private:
   const int id_;
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
index 72aac2e..59d91cf 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -203,9 +203,10 @@ class MEDIA_EXPORT VideoCaptureDevice {
       virtual int id() const = 0;
       virtual size_t size() const = 0;
       virtual void* data() = 0;
-      virtual gfx::GpuMemoryBufferType GetType() = 0;
       virtual ClientBuffer AsClientBuffer() = 0;
-      virtual base::PlatformFile AsPlatformFile() = 0;
+#if defined(OS_POSIX)
+      virtual base::FileDescriptor AsPlatformFile() = 0;
+#endif
     };
 
     virtual ~Client() {}