Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/win/capability_list_win.h

Index: trunk/src/media/video/capture/win/capability_list_win.h
===================================================================
--- trunk/src/media/video/capture/win/capability_list_win.h	(revision 236934)
+++ trunk/src/media/video/capture/win/capability_list_win.h	(working copy)
@@ -16,7 +16,7 @@
 
 namespace media {
 
-struct VideoCaptureCapabilityWin {
+struct VideoCaptureCapabilityWin : public VideoCaptureCapability {
   explicit VideoCaptureCapabilityWin(int index)
       : stream_index(index),
         frame_rate_numerator(0),
@@ -26,7 +26,6 @@
   // so framerates can be properly represented, f.i. 29.971fps= 30000/1001.
   int frame_rate_numerator;
   int frame_rate_denominator;
-  VideoCaptureFormat supported_format;
 };
 
 class CapabilityList : public base::NonThreadSafe {
@@ -42,9 +41,8 @@
   // Loops through the list of capabilities and returns an index of the best
   // matching capability.  The algorithm prioritizes height, width, frame rate
   // and color format in that order.
-  const VideoCaptureCapabilityWin& GetBestMatchedFormat(
-      int requested_width,
-      int requested_height,
+  const VideoCaptureCapabilityWin& GetBestMatchedCapability(
+      int requested_width, int requested_height,
       int requested_frame_rate) const;
 
  private: