Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/browser/renderer_host/media/media_stream_device_settings.h

Index: content/browser/renderer_host/media/media_stream_device_settings.h
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.h b/content/browser/renderer_host/media/media_stream_device_settings.h
index 0a83cda550d09845b8634ffdd2d98d7495888c3c..9e7cc482807e8393137401a25e545fcf5d67bf5a 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.h
+++ b/content/browser/renderer_host/media/media_stream_device_settings.h
@@ -7,22 +7,16 @@
 // There will be one instance of MediaStreamDeviceSettings handling all
 // requests.
 
-// This version always accepts the first device in the list(s), but this will
-// soon be changed to ask the user and/or Chrome settings.
-
 // Expected call flow:
-// 1. RequestCaptureDeviceUsage() to request usage of capture device.
-// 2. SettingsRequester::GetDevices() is called to get a list of available
-//    devices.
+// 1. MediaStreamProvider::EnumrateDevices() is called to enumerate a list of

[mflodman_chromium_OOO, 2012/04/27 14:39:17]

I'd prefer to remove 1 since that is not done in this class.

+//    available devices.
+// 2. RequestCaptureDeviceUsage() is called to create a new request for capture
+//    device usage.
 // 3. AvailableDevices() is called with a list of currently available devices.
-// 4. TODO(mflodman) Pick device and get user confirmation.
-// Temporary 4. Choose first device of each requested media type.
+// 4. Pick device and get user confirmation.
 // 5. Confirm by calling SettingsRequester::DevicesAccepted().
 // Repeat step 1 - 5 for new device requests.
 
-// Note that this is still in a development phase and the class will be modified
-// to include real UI interaction.
-
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DEVICE_SETTINGS_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DEVICE_SETTINGS_H_
 
@@ -72,7 +66,7 @@ class CONTENT_EXPORT MediaStreamDeviceSettings
   void UseFakeUI();
 
  private:
-  typedef std::map< std::string, MediaStreamDeviceSettingsRequest* >
+  typedef std::map<std::string, MediaStreamDeviceSettingsRequest*>
       SettingsRequests;
 
   SettingsRequester* requester_;