Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/browser/renderer_host/media/media_stream_device_settings.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MediaStreamDeviceSettings is used to decide which of the available capture
 // device to use as well as getting user permission to use the capture device.
 // 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_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 
@@ skipping 29 matching lines @@
   // This method must be called on the IO thread.
   void PostResponse(const std::string& label,
                     const content::MediaStreamDevices& devices);
 
   // Used for testing only. This function is called to use faked UI, which is
   // needed for server based tests. The first non-opened device(s) will be
   // picked.
   void UseFakeUI();
 
  private:
-  typedef std::map< std::string, MediaStreamDeviceSettingsRequest* >
+  typedef std::map<std::string, MediaStreamDeviceSettingsRequest*>
       SettingsRequests;
 
   SettingsRequester* requester_;
   SettingsRequests requests_;
 
   // See comment above for method UseFakeUI. Used for automated testing.
   bool use_fake_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDeviceSettings);
 };
 
 }  // namespace media_stream
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DEVICE_SETTINGS_H_