Added supported formats caching to VideoCaptureManager.

media/video/capture/video_capture_types.h

Index: media/video/capture/video_capture_types.h
diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h
index d06c1b42290251589bad226d7c63b8df35f7d7d3..6a4f453280bd501f5dd0845a51c6aae45c60e22f 100644
--- a/media/video/capture/video_capture_types.h
+++ b/media/video/capture/video_capture_types.h
@@ -32,7 +32,8 @@ enum VideoPixelFormat {
 
 // Video capture format specification.
 // This class is used by the video capture device to specify the format of every
-// frame captured and returned to a client.
+// frame captured and returned to a client. It is also used to specify a
+// supported capture format by a device.
 class MEDIA_EXPORT VideoCaptureFormat {
  public:
   VideoCaptureFormat();
@@ -49,6 +50,8 @@ class MEDIA_EXPORT VideoCaptureFormat {
   VideoPixelFormat pixel_format;
 };
 
+typedef std::vector<VideoCaptureFormat> VideoCaptureFormats;
+
 // Parameters for starting video capture.
 // This class is used by the client of a video capture device to specify the
 // format of frames in which the client would like to have captured frames
@@ -64,19 +67,6 @@ class MEDIA_EXPORT VideoCaptureParams {
   bool allow_resolution_change;
 };
 
-// Capabilities describe the format a camera captures video in.
-// This class is used by the video capture device to report the formats in which
-// it is capable of capturing frames.
-class MEDIA_EXPORT VideoCaptureCapability {
- public:
-  VideoCaptureCapability();
-
-  // Supported resolution and format.
-  VideoCaptureFormat supported_format;
-};
-
-typedef std::vector<VideoCaptureCapability> VideoCaptureCapabilities;
-
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_