Reland [Mojo Video Capture] Simplify media::VideoCaptureDevice::Client:Buffer to a struct

media/capture/video/shared_memory_buffer_tracker.cc

Index: media/capture/video/shared_memory_buffer_tracker.cc
diff --git a/media/capture/video/shared_memory_buffer_tracker.cc b/media/capture/video/shared_memory_buffer_tracker.cc
index d21e35d7863f9005de4b08b04262f14f827678d9..dfdae676d226080d37ff528c4b299e3f1791a82a 100644
--- a/media/capture/video/shared_memory_buffer_tracker.cc
+++ b/media/capture/video/shared_memory_buffer_tracker.cc
@@ -30,7 +30,7 @@ bool SharedMemoryBufferTracker::Init(const gfx::Size& dimensions,
 }
 
 std::unique_ptr<VideoCaptureBufferHandle>
-SharedMemoryBufferTracker::GetBufferHandle() {
+SharedMemoryBufferTracker::GetMemoryMappedAccess() {
   return base::MakeUnique<SharedMemoryBufferHandle>(this);
 }
 
@@ -41,37 +41,27 @@ SharedMemoryBufferTracker::GetHandleForTransit() {
       mapped_size_, false /* read_only */);
 }
 
+base::SharedMemoryHandle
+SharedMemoryBufferTracker::GetNonOwnedSharedMemoryHandleForLegacyIPC() {
+  return shared_memory_.handle();

[mcasas, 2017/01/12 00:25:26]

I was surprised to see that here we don't need
base::SharedMemory::DuplicateHandle(shared_memory_.handle()
but then I recalled that IPC does it among its
black magics, plus the win bots are happy.

+}
+
 SharedMemoryBufferHandle::SharedMemoryBufferHandle(
     SharedMemoryBufferTracker* tracker)
     : tracker_(tracker) {}
 
 SharedMemoryBufferHandle::~SharedMemoryBufferHandle() = default;
 
-gfx::Size SharedMemoryBufferHandle::dimensions() const {
-  return tracker_->dimensions();
-}
-
 size_t SharedMemoryBufferHandle::mapped_size() const {
   return tracker_->mapped_size_;
 }
 
-void* SharedMemoryBufferHandle::data(int plane) {
-  DCHECK_EQ(0, plane);
-  return tracker_->shared_memory_.memory();
-}
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-base::FileDescriptor SharedMemoryBufferHandle::AsPlatformFile() {
-  return tracker_->shared_memory_.handle();
-}
-#endif
-
-bool SharedMemoryBufferHandle::IsBackedByVideoFrame() const {
-  return false;
+uint8_t* SharedMemoryBufferHandle::data() {
+  return static_cast<uint8_t*>(tracker_->shared_memory_.memory());
 }
 
-scoped_refptr<VideoFrame> SharedMemoryBufferHandle::GetVideoFrame() {
-  return scoped_refptr<VideoFrame>();
+const uint8_t* SharedMemoryBufferHandle::data() const {
+  return static_cast<const uint8_t*>(tracker_->shared_memory_.memory());
 }
 
 }  // namespace media