Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/win/sink_filter_win.h

Index: media/video/capture/win/sink_filter_win.h
diff --git a/media/video/capture/win/sink_filter_win.h b/media/video/capture/win/sink_filter_win.h
index 5145cd4fc8b641479e062cf029d36f84581bd7be..c2ff55e092667b335076a5bc6af9c6f0165f4e2a 100644
--- a/media/video/capture/win/sink_filter_win.h
+++ b/media/video/capture/win/sink_filter_win.h
@@ -12,6 +12,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
 #include "media/video/capture/win/filter_base_win.h"
 #include "media/video/capture/win/sink_filter_observer_win.h"
 
@@ -32,10 +33,10 @@ class __declspec(uuid("88cdbbdc-a73b-4afa-acbf-15d5e2ce12c3"))
   virtual ~SinkFilter();
 
   void SetRequestedMediaCapability(
-      const VideoCaptureDevice::Capability& capability);
+      const VideoCaptureCapability& capability);
   // Returns the capability that is negotiated when this
   // filter is connected to a media filter.
-  const VideoCaptureDevice::Capability& ResultingCapability();
+  const VideoCaptureCapability& ResultingCapability();
 
   // Implement FilterBase.
   virtual size_t NoOfPins();