Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/win/sink_input_pin_win.h

 // Copyright (c) 2011 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.
 
 // Implement a DirectShow input pin used for receiving captured frames from
 // a DirectShow Capture filter.
 
 #ifndef MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_
 #define MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_
 #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"
 
 namespace media {
 
 // Const used for converting Seconds to REFERENCE_TIME.
 extern const REFERENCE_TIME kSecondsToReferenceTime;
 
 // Input pin of the SinkFilter.
 class SinkInputPin : public PinBase {
  public:
   SinkInputPin(IBaseFilter* filter, SinkFilterObserver* observer);
   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);
   virtual bool GetValidMediaType(int index, AM_MEDIA_TYPE* media_type);
 
   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);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_WIN_SINK_INPUT_PIN_WIN_H_