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

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

Index: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index 69c046815a99af3e53fd058370d49536ee124c4a..c5fd745baf4300dfa1195d2c8390b60c29a8525e 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -62,7 +62,7 @@ class VideoCaptureBufferPoolTest
     ~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_;
@@ -100,7 +100,7 @@ class VideoCaptureBufferPoolTest
     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));
   }
@@ -114,7 +114,7 @@ class VideoCaptureBufferPoolTest
     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_;