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

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

 // Copyright (c) 2013 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.
 
 // Unit test for VideoCaptureBufferPool.
 
 #include "media/capture/video/video_capture_buffer_pool.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 44 matching lines @@
   // This is a generic Buffer tracker
   class Buffer {
    public:
     Buffer(const scoped_refptr<media::VideoCaptureBufferPool> pool,
            std::unique_ptr<media::VideoCaptureBufferHandle> buffer_handle,
            int id)
         : id_(id), pool_(pool), buffer_handle_(std::move(buffer_handle)) {}
     ~Buffer() { pool_->RelinquishProducerReservation(id()); }
     int id() const { return id_; }
     size_t mapped_size() { return buffer_handle_->mapped_size(); }
-    void* data() { return buffer_handle_->data(0); }
+    void* data() { return buffer_handle_->data(); }
 
    private:
     const int id_;
     const scoped_refptr<media::VideoCaptureBufferPool> pool_;
     const std::unique_ptr<media::VideoCaptureBufferHandle> buffer_handle_;
   };
 
   VideoCaptureBufferPoolTest()
       : expected_dropped_id_(0),
         pool_(new media::VideoCaptureBufferPoolImpl(
@@ skipping 17 matching lines @@
     const int arbitrary_frame_feedback_id = 0;
     const int buffer_id = pool_->ReserveForProducer(
         dimensions, format_and_storage.pixel_format,
         format_and_storage.pixel_storage, arbitrary_frame_feedback_id,
         &buffer_id_to_drop);
     if (buffer_id == media::VideoCaptureBufferPool::kInvalidId)
       return std::unique_ptr<Buffer>();
     EXPECT_EQ(expected_dropped_id_, buffer_id_to_drop);
 
     std::unique_ptr<media::VideoCaptureBufferHandle> buffer_handle =
-        pool_->GetBufferHandle(buffer_id);
+        pool_->GetReadWriteAccess(buffer_id);
     return std::unique_ptr<Buffer>(
         new Buffer(pool_, std::move(buffer_handle), buffer_id));
   }
 
   std::unique_ptr<Buffer> ResurrectLastBuffer(
       const gfx::Size& dimensions,
       PixelFormatAndStorage format_and_storage) {
     const int buffer_id = pool_->ResurrectLastForProducer(
         dimensions, format_and_storage.pixel_format,
         format_and_storage.pixel_storage);
     if (buffer_id == media::VideoCaptureBufferPool::kInvalidId)
       return std::unique_ptr<Buffer>();
     return std::unique_ptr<Buffer>(
-        new Buffer(pool_, pool_->GetBufferHandle(buffer_id), buffer_id));
+        new Buffer(pool_, pool_->GetReadWriteAccess(buffer_id), buffer_id));
   }
 
   base::MessageLoop loop_;
   int expected_dropped_id_;
   scoped_refptr<media::VideoCaptureBufferPool> pool_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureBufferPoolTest);
 };
 
@@ skipping 282 matching lines @@
   ASSERT_NE(nullptr, held_buffers.back().get());
   resurrected = ResurrectLastBuffer(gfx::Size(10, 10), GetParam());
   ASSERT_EQ(nullptr, resurrected.get());
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         VideoCaptureBufferPoolTest,
                         testing::ValuesIn(kCapturePixelFormatAndStorages));
 
 } // namespace content