Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/linux/video_capture_device_linux.h

 // Copyright (c) 2012 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.
 
 // Linux specific implementation of VideoCaptureDevice.
 // V4L2 is used for capturing. V4L2 does not provide its own thread for
 // capturing so this implementation uses a Chromium thread for fetching frames
 // from V4L2.
 
 #ifndef MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
 #define MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
 
 #include <string>
 
 #include "base/threading/thread.h"
 #include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
 class VideoCaptureDeviceLinux : public VideoCaptureDevice {
  public:
   explicit VideoCaptureDeviceLinux(const Name& device_name);
   virtual ~VideoCaptureDeviceLinux();
 
   // VideoCaptureDevice implementation.
   virtual void Allocate(int width,
@@ skipping 42 matching lines @@
   base::Thread v4l2_thread_;  // Thread used for reading data from the device.
   Buffer* buffer_pool_;
   int buffer_pool_size_;  // Number of allocated buffers.
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_