Added video capture capabilities retrieval and caching to VideoCaptureManager

media/video/capture/video_capture_device.h

Index: media/video/capture/video_capture_device.h
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
index 2e60256a8f121f232b950e750391ac640b9e8484..59b1ac858a83dfe6488385e8a33473a01042a36f 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -34,9 +34,8 @@ class MEDIA_EXPORT VideoCaptureDevice {
   // VideoCaptureDevice::Create.
   class MEDIA_EXPORT Name {
    public:
-    Name() {}
-    Name(const std::string& name, const std::string& id)
-        : device_name_(name), unique_id_(id) {}
+    Name();
+    Name(const std::string& name, const std::string& id);
 
 #if defined(OS_WIN)
     // Windows targets Capture Api type: it can only be set on construction.
@@ -51,7 +50,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
          const CaptureApiType api_type)
         : device_name_(name), unique_id_(id), capture_api_class_(api_type) {}
 #endif  // if defined(OS_WIN)
-    ~Name() {}
+    ~Name();
 
     // Friendly name of a device
     const std::string& name() const { return device_name_; }
@@ -87,6 +86,8 @@ class MEDIA_EXPORT VideoCaptureDevice {
    private:
     std::string device_name_;
     std::string unique_id_;
+    VideoCaptureCapabilities capture_formats_;

[tommi (sloooow) - chröme, 2013/10/25 14:15:34]

I haven't made up my mind whether adding capabilities to this class is a good
idea but right now it doesn't look like this variable is ever used.

[mcasas, 2013/10/28 12:50:08]

This should go, is left from an experiment.

+
 #if defined(OS_WIN)
     // This class wraps the CaptureApiType, so it has a by default value if not
     // inititalized, and I (mcasas) do a DCHECK on reading its value.
@@ -105,6 +106,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
 
     CaptureApiClass capture_api_class_;
 #endif  // if defined(OS_WIN)
+
     // Allow generated copy constructor and assignment.
   };