Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_factory.h

Index: media/capture/video/video_capture_device_factory.h
diff --git a/media/capture/video/video_capture_device_factory.h b/media/capture/video/video_capture_device_factory.h
index de16133078b4076e50cba4125c98be7aaebf33ab..33da2320b92e3756a6f91f1fc69cab4886ca4f42 100644
--- a/media/capture/video/video_capture_device_factory.h
+++ b/media/capture/video/video_capture_device_factory.h
@@ -15,6 +15,11 @@ namespace media {
 // devices in the different platforms. VCDFs are created by MediaStreamManager
 // on IO thread and plugged into VideoCaptureManager, who owns and operates them
 // in Device Thread (a.k.a. Audio Thread).
+// Typical operation is to first call EnumerateDeviceDescriptors() to obtain
+// information about available devices. The obtained descriptors can then be
+// used to either obtain the supported formats of a device using
+// GetSupportedFormats(), or to create an instance of VideoCaptureDevice for
+// the device using CreateDevice().
 class CAPTURE_EXPORT VideoCaptureDeviceFactory {
  public:
   static std::unique_ptr<VideoCaptureDeviceFactory> CreateFactory(
@@ -24,26 +29,29 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactory {
   virtual ~VideoCaptureDeviceFactory();
 
   // Creates a VideoCaptureDevice object. Returns NULL if something goes wrong.
-  virtual std::unique_ptr<VideoCaptureDevice> Create(
-      const VideoCaptureDevice::Name& device_name) = 0;
+  virtual std::unique_ptr<VideoCaptureDevice> CreateDevice(
+      const VideoCaptureDeviceDescriptor& device_descriptor) = 0;
 
-  // Asynchronous version of GetDeviceNames calling back to |callback|.
-  virtual void EnumerateDeviceNames(
+  // Asynchronous version of GetDeviceDescriptors calling back to |callback|.
+  virtual void EnumerateDeviceDescriptors(
       const base::Callback<
-          void(std::unique_ptr<media::VideoCaptureDevice::Names>)>& callback);
+          void(std::unique_ptr<VideoCaptureDeviceDescriptors>)>& callback);
 
-  // Gets the supported formats of a particular device attached to the system.
+  // Obtains the supported formats of a device.
   // This method should be called before allocating or starting a device. In
-  // case format enumeration is not supported, or there was a problem, the
-  // formats array will be empty.
-  virtual void GetDeviceSupportedFormats(
-      const VideoCaptureDevice::Name& device,
+  // case format enumeration is not supported, or there was a problem
+  // |supported_formats| will be empty.
+  virtual void GetSupportedFormats(
+      const VideoCaptureDeviceDescriptor& device_descriptor,
       VideoCaptureFormats* supported_formats) = 0;
 
  protected:
-  // Gets the names of all video capture devices connected to this computer.
-  // Used by the default implementation of EnumerateDeviceNames().
-  virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) = 0;
+  // Gets descriptors of all video capture devices connected.
+  // Used by the default implementation of EnumerateDevices().
+  // Note: The same physical device may appear more than once if it is
+  // accessible through different APIs.
+  virtual void GetDeviceDescriptors(
+      VideoCaptureDeviceDescriptors* device_descriptors) = 0;
 
   base::ThreadChecker thread_checker_;