Revert of [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 9c93cfc634deb3ca4754cc27100b8646c6b619b9..69c046815a99af3e53fd058370d49536ee124c4a 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 @@
     ~Buffer() { pool_->RelinquishProducerReservation(id()); }
     int id() const { return id_; }
     size_t mapped_size() { return buffer_handle_->mapped_size(); }
-    void* data() { return buffer_handle_->data(); }
+    void* data() { return buffer_handle_->data(0); }
 
    private:
     const int id_;
@@ -100,7 +100,7 @@
     EXPECT_EQ(expected_dropped_id_, buffer_id_to_drop);
 
     std::unique_ptr<media::VideoCaptureBufferHandle> buffer_handle =
-        pool_->GetHandleForInProcessAccess(buffer_id);
+        pool_->GetBufferHandle(buffer_id);
     return std::unique_ptr<Buffer>(
         new Buffer(pool_, std::move(buffer_handle), buffer_id));
   }
@@ -113,8 +113,8 @@
         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_->GetHandleForInProcessAccess(buffer_id), buffer_id));
+    return std::unique_ptr<Buffer>(
+        new Buffer(pool_, pool_->GetBufferHandle(buffer_id), buffer_id));
   }
 
   base::MessageLoop loop_;