Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/video_capture_device_unittest.cc

Index: media/video/capture/video_capture_device_unittest.cc
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index 15242044ad6f63be11b9c75de009046af8fd3efa..b3e638f861fbbbdd81c0931df021220f021e0e66 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -39,7 +39,7 @@ class MockFrameObserver : public media::VideoCaptureDevice::EventHandler {
   }
 
   virtual void OnFrameInfo(
-      const VideoCaptureDevice::Capability& info) OVERRIDE {
+      const media::VideoCaptureCapability& info) OVERRIDE {
     OnFrameInfo(info.width, info.height, info.frame_rate);
   }