| Index: media/video/capture/linux/video_capture_device_linux.h
|
| diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h
|
| index 4cc1597a8bcb81530cca27e662bea026762568e8..6a8dcee126163e987cdbd1eb8961b3b05da2b9c2 100644
|
| --- a/media/video/capture/linux/video_capture_device_linux.h
|
| +++ b/media/video/capture/linux/video_capture_device_linux.h
|
| @@ -13,6 +13,7 @@
|
| #include <string>
|
|
|
| #include "base/file_util.h"
|
| +#include "base/files/scoped_file.h"
|
| #include "base/threading/thread.h"
|
| #include "media/video/capture/video_capture_device.h"
|
| #include "media/video/capture/video_capture_types.h"
|
| @@ -60,8 +61,7 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
|
| InternalState state_;
|
| scoped_ptr<VideoCaptureDevice::Client> client_;
|
| Name device_name_;
|
| - int device_fd_; // File descriptor for the opened camera device.
|
| - file_util::ScopedFD device_fd_closer_;
|
| + base::ScopedFD device_fd_; // File descriptor for the opened camera device.
|
| base::Thread v4l2_thread_; // Thread used for reading data from the device.
|
| Buffer* buffer_pool_;
|
| int buffer_pool_size_; // Number of allocated buffers.
|
|
|