Reland: Reorganize media::VideoCapture* types

media/video/capture/win/sink_filter_win.cc

Index: media/video/capture/win/sink_filter_win.cc
diff --git a/media/video/capture/win/sink_filter_win.cc b/media/video/capture/win/sink_filter_win.cc
index c3fc410dd7f62efb14465ce70ad2bdeca0ee75a7..e3bb0a58564a3b82f3c9a13c50f2685d67e64696 100644
--- a/media/video/capture/win/sink_filter_win.cc
+++ b/media/video/capture/win/sink_filter_win.cc
@@ -28,13 +28,12 @@ SinkFilter::~SinkFilter() {
   input_pin_->SetOwner(NULL);
 }
 
-void SinkFilter::SetRequestedMediaCapability(
-    const VideoCaptureCapability& capability) {
-  input_pin_->SetRequestedMediaCapability(capability);
+void SinkFilter::SetRequestedMediaFormat(const VideoCaptureFormat& format) {
+  input_pin_->SetRequestedMediaFormat(format);
 }
 
-const VideoCaptureCapability& SinkFilter::ResultingCapability() {
-  return input_pin_->ResultingCapability();
+const VideoCaptureFormat& SinkFilter::ResultingFormat() {
+  return input_pin_->ResultingFormat();
 }
 
 size_t SinkFilter::NoOfPins() {