Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/win/sink_input_pin_win.h

Index: media/video/capture/win/sink_input_pin_win.h
diff --git a/media/video/capture/win/sink_input_pin_win.h b/media/video/capture/win/sink_input_pin_win.h
index 839661daccc1b51a68a613dfa6b3654cabe6aa4b..a079fc0a8ee345634a6dc8d891653c3c690c6a79 100644
--- a/media/video/capture/win/sink_input_pin_win.h
+++ b/media/video/capture/win/sink_input_pin_win.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
 #include "media/video/capture/win/pin_base_win.h"
 #include "media/video/capture/win/sink_filter_win.h"
 
@@ -25,10 +26,10 @@ class SinkInputPin : public PinBase {
   virtual ~SinkInputPin();
 
   void SetRequestedMediaCapability(

[scherkus (not reviewing), 2012/04/27 17:42:41]

nit: this can fit on one line

-      const VideoCaptureDevice::Capability& capability);
+      const VideoCaptureCapability& capability);
   // Returns the capability that is negotiated when this
   // pin is connected to a media filter.
-  const VideoCaptureDevice::Capability& ResultingCapability();
+  const VideoCaptureCapability& ResultingCapability();
 
   // Implement PinBase.
   virtual bool IsMediaTypeValid(const AM_MEDIA_TYPE* media_type);
@@ -37,8 +38,8 @@ class SinkInputPin : public PinBase {
   STDMETHOD(Receive)(IMediaSample* media_sample);
 
  private:
-  VideoCaptureDevice::Capability requested_capability_;
-  VideoCaptureDevice::Capability resulting_capability_;
+  VideoCaptureCapability requested_capability_;
+  VideoCaptureCapability resulting_capability_;
   SinkFilterObserver* observer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(SinkInputPin);