app_shell: Allow getUserMedia to select a capture device by id

Return the device if it exists. Still return the first available device
if getUserMedia() doesn't ask for one in particular.

BUG=407236
TEST=manual

Review URL: https://codereview.chromium.org/514463002

Cr-Commit-Position: refs/heads/master@{#292061}

extensions/shell/browser/media_capture_util.cc

@@ -4,32 +4,43 @@
 
 #include "extensions/shell/browser/media_capture_util.h"
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/logging.h"
 #include "content/public/browser/media_capture_devices.h"
 #include "extensions/common/permissions/permissions_data.h"
 
 using content::MediaCaptureDevices;
+using content::MediaStreamDevice;
 using content::MediaStreamDevices;
 using content::MediaStreamUI;
 
 namespace extensions {
+
+const MediaStreamDevice* GetRequestedDeviceOrDefault(
+    const MediaStreamDevices& devices,
+    const std::string& requested_device_id) {
+  if (!requested_device_id.empty())
+    return devices.FindById(requested_device_id);
+
+  if (!devices.empty())
+    return &devices[0];
+
+  return NULL;
+}
+
 namespace media_capture_util {
 
 // See also Chrome's MediaCaptureDevicesDispatcher.
-void GrantMediaStreamRequestWithFirstDevice(
-    content::WebContents* web_contents,
-    const content::MediaStreamRequest& request,
-    const content::MediaResponseCallback& callback,
-    const Extension* extension) {
+void GrantMediaStreamRequest(content::WebContents* web_contents,
+                             const content::MediaStreamRequest& request,
+                             const content::MediaResponseCallback& callback,
+                             const Extension* extension) {
   // app_shell only supports audio and video capture, not tab or screen capture.
   DCHECK(request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
          request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE);
 
-  // app_shell does not support requesting a specific device ID.
-  DCHECK(request.requested_audio_device_id.empty() &&
-         request.requested_video_device_id.empty());
-
   MediaStreamDevices devices;
   const PermissionsData* permissions_data = extension->permissions_data();
 
@@ -39,11 +50,11 @@ void GrantMediaStreamRequestWithFirstDevice(
     CHECK(permissions_data->HasAPIPermission(APIPermission::kAudioCapture))
         << "Audio capture request but no audioCapture permission in manifest.";
 
-    // Use first available audio capture device.
-    const MediaStreamDevices& audio_devices =
-        MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices();
-    if (!audio_devices.empty())
-      devices.push_back(audio_devices[0]);
+    const MediaStreamDevice* device = GetRequestedDeviceOrDefault(
+        MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices(),
+        request.requested_audio_device_id);
+    if (device)
+      devices.push_back(*device);
   }
 
   if (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
@@ -51,11 +62,11 @@ void GrantMediaStreamRequestWithFirstDevice(
     CHECK(permissions_data->HasAPIPermission(APIPermission::kVideoCapture))
         << "Video capture request but no videoCapture permission in manifest.";
 
-    // Use first available video capture device.
-    const MediaStreamDevices& video_devices =
-        MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
-    if (!video_devices.empty())
-      devices.push_back(video_devices[0]);
+    const MediaStreamDevice* device = GetRequestedDeviceOrDefault(
+        MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices(),
+        request.requested_video_device_id);
+    if (device)
+      devices.push_back(*device);
   }
 
   // TODO(jamescook): Should we show a recording icon somewhere? If so, where?

extensions/shell/browser/media_capture_util.h

@@ -18,14 +18,15 @@ class Extension;
 
 namespace media_capture_util {
 
-// Grants access to the first available audio capture device (if requested) and
-// the first available video capture device (if requested). Usually used as a
-// helper for media capture ProcessMediaAccessRequest().
-void GrantMediaStreamRequestWithFirstDevice(
-    content::WebContents* web_contents,
-    const content::MediaStreamRequest& request,
-    const content::MediaResponseCallback& callback,
-    const Extension* extension);
+// Grants access to audio and video capture devices.
+// * If the caller requests specific device ids, grants access to those.
+// * If the caller does not request specific ids, grants access to the first
+//   available device.
+// Usually used as a helper for media capture ProcessMediaAccessRequest().
+void GrantMediaStreamRequest(content::WebContents* web_contents,
+                             const content::MediaStreamRequest& request,
+                             const content::MediaResponseCallback& callback,
+                             const Extension* extension);
 
 }  // namespace media_capture_util
 }  // namespace extensions

extensions/shell/browser/shell_app_window.cc

@@ -65,8 +65,8 @@ void ShellAppWindow::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
-  // Allow access to the first microphone and/or camera.
-  media_capture_util::GrantMediaStreamRequestWithFirstDevice(
+  // Allow access to the microphone and/or camera.
+  media_capture_util::GrantMediaStreamRequest(
       web_contents, request, callback, extension_);
 }
 

extensions/shell/browser/shell_extension_host_delegate.cc

@@ -47,8 +47,8 @@ void ShellExtensionHostDelegate::ProcessMediaAccessRequest(
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback,
     const Extension* extension) {
-  // Allow access to the first microphone and/or camera.
-  media_capture_util::GrantMediaStreamRequestWithFirstDevice(
+  // Allow access to the microphone and/or camera.
+  media_capture_util::GrantMediaStreamRequest(
       web_contents, request, callback, extension);
 }