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

media/capture/video/fake_video_capture_device_unittest.cc

 // Copyright 2014 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.
 
 #include "media/capture/video/fake_video_capture_device.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 16 matching lines @@
 using ::testing::_;
 using ::testing::Bool;
 using ::testing::Combine;
 using ::testing::SaveArg;
 using ::testing::Values;
 
 namespace media {
 
 namespace {
 
-// This class is a Client::Buffer that allocates and frees the requested |size|.
-class MockBuffer : public VideoCaptureDevice::Client::Buffer {
+class StubBufferHandle : public VideoCaptureBufferHandle {
  public:
-  MockBuffer(int buffer_id, int frame_feedback_id, size_t mapped_size)
-      : id_(buffer_id),
-        frame_feedback_id_(frame_feedback_id),
-        mapped_size_(mapped_size),
-        data_(new uint8_t[mapped_size]) {}
-  ~MockBuffer() override { delete[] data_; }
+  StubBufferHandle(size_t mapped_size, uint8_t* data)
+      : mapped_size_(mapped_size), data_(data) {}
 
-  int id() const override { return id_; }
-  int frame_feedback_id() const override { return frame_feedback_id_; }
-  gfx::Size dimensions() const override { return gfx::Size(); }
   size_t mapped_size() const override { return mapped_size_; }
-  void* data(int plane) override { return data_; }
-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS))
-  base::FileDescriptor AsPlatformFile() override {
-    return base::FileDescriptor();
-  }
-#endif
-  bool IsBackedByVideoFrame() const override { return false; };
-  scoped_refptr<VideoFrame> GetVideoFrame() override { return nullptr; }
+  uint8_t* data() override { return data_; }
+  const uint8_t* data() const override { return data_; }
 
  private:
-  const int id_;
-  const int frame_feedback_id_;
   const size_t mapped_size_;
   uint8_t* const data_;
 };
 
+class StubBufferAccessProvider : public BufferAccessProvider {
+ public:
+  StubBufferAccessProvider(size_t mapped_size, uint8_t* data)
+      : mapped_size_(mapped_size), data_(data) {}
+
+  ~StubBufferAccessProvider() override { delete[] data_; }
+
+  mojo::ScopedSharedBufferHandle GetHandleForTransit() override {
+    return mojo::ScopedSharedBufferHandle();
+  }
+
+  std::unique_ptr<VideoCaptureBufferHandle> GetReadWriteAccess() override {
+    return base::MakeUnique<StubBufferHandle>(mapped_size_, data_);
+  }
+
+ private:
+  const size_t mapped_size_;
+  uint8_t* const data_;
+};
+
+VideoCaptureDevice::Client::Buffer CreateStubBuffer(int buffer_id,
+                                                    size_t mapped_size) {
+  auto buffer = new uint8_t[mapped_size];
+  const int arbitrary_frame_feedback_id = 0;
+  return VideoCaptureDevice::Client::Buffer(
+      buffer_id, arbitrary_frame_feedback_id,
+      base::MakeUnique<StubBufferAccessProvider>(mapped_size, buffer));
+};
+
 class MockClient : public VideoCaptureDevice::Client {
  public:
   MOCK_METHOD2(OnError,
                void(const tracked_objects::Location& from_here,
                     const std::string& reason));
 
   explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb)
       : frame_cb_(frame_cb) {}
 
   // Client virtual methods for capturing using Device Buffers.
   void OnIncomingCapturedData(const uint8_t* data,
                               int length,
                               const VideoCaptureFormat& format,
                               int rotation,
                               base::TimeTicks reference_time,
                               base::TimeDelta timestamp,
                               int frame_feedback_id) override {
     frame_cb_.Run(format);
   }
   // Virtual methods for capturing using Client's Buffers.
-  std::unique_ptr<Buffer> ReserveOutputBuffer(const gfx::Size& dimensions,
-                                              media::VideoPixelFormat format,
-                                              media::VideoPixelStorage storage,
-                                              int frame_feedback_id) override {
+  Buffer ReserveOutputBuffer(const gfx::Size& dimensions,
+                             media::VideoPixelFormat format,
+                             media::VideoPixelStorage storage,
+                             int frame_feedback_id) override {
     EXPECT_TRUE((format == media::PIXEL_FORMAT_ARGB &&
                  storage == media::PIXEL_STORAGE_CPU));
     EXPECT_GT(dimensions.GetArea(), 0);
     const VideoCaptureFormat frame_format(dimensions, 0.0, format);
-    return base::MakeUnique<MockBuffer>(0, frame_feedback_id,
-                                        frame_format.ImageAllocationSize());
+    return CreateStubBuffer(0, frame_format.ImageAllocationSize());
   }
-  void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
+  void OnIncomingCapturedBuffer(Buffer buffer,
                                 const VideoCaptureFormat& format,
                                 base::TimeTicks reference_time,
                                 base::TimeDelta timestamp) override {
     frame_cb_.Run(format);
   }
   void OnIncomingCapturedBufferExt(
-      std::unique_ptr<Buffer> buffer,
+      Buffer buffer,
       const VideoCaptureFormat& format,
       base::TimeTicks reference_time,
       base::TimeDelta timestamp,
       gfx::Rect visible_rect,
       const VideoFrameMetadata& additional_metadata) override {
     frame_cb_.Run(format);
   }
-  std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
-      const gfx::Size& dimensions,
-      media::VideoPixelFormat format,
-      media::VideoPixelStorage storage,
-      int frame_feedback_id) override {
-    return std::unique_ptr<Buffer>();
+  Buffer ResurrectLastOutputBuffer(const gfx::Size& dimensions,
+                                   media::VideoPixelFormat format,
+                                   media::VideoPixelStorage storage,
+                                   int frame_feedback_id) override {
+    return Buffer();
   }
   double GetBufferPoolUtilization() const override { return 0.0; }
 
  private:
   base::Callback<void(const VideoCaptureFormat&)> frame_cb_;
 };
 
 class DeviceEnumerationListener
     : public base::RefCounted<DeviceEnumerationListener> {
  public:
@@ skipping 347 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     ,
     FakeVideoCaptureDeviceCommandLineTest,
     Values(CommandLineTestData{"fps=-1", 5, 1u},
            CommandLineTestData{"fps=29.97, device-count=1", 29.97f, 1u},
            CommandLineTestData{"fps=60, device-count=2", 60, 2u},
            CommandLineTestData{"fps=1000, device-count=-1", 60, 1u},
            CommandLineTestData{"device-count=2", 20, 2u},
            CommandLineTestData{"device-count=0", 20, 1u}));
 };  // namespace media