Do not expose media devices before a successful getUserMedia()

This is a spec-compliance change.

This CL also adds some improvements to the blink MediaDevices unit test.

Bug: 1101860
Change-Id: If2e7824df3b3dbd3cdb80f4bcf6b5c417d6f0ef2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2279808
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Harald Alvestrand <hta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786253}

chrome/browser/media/webrtc/webrtc_browsertest_base.cc

@@ -149,6 +149,12 @@ bool WebRtcTestBase::GetUserMediaAndAccept(
       tab_contents, kAudioVideoCallConstraints);
 }
 
+bool WebRtcTestBase::GetUserMediaAndAcceptIfPrompted(
+    content::WebContents* tab_contents) const {
+  return GetUserMediaWithSpecificConstraintsAndAcceptIfPrompted(
+      tab_contents, kAudioVideoCallConstraints);
+}
+
 bool WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndAccept(
     content::WebContents* tab_contents,
     const std::string& constraints) const {

chrome/browser/media/webrtc/webrtc_browsertest_base.h

@@ -73,6 +73,8 @@ class WebRtcTestBase : public InProcessBrowserTest {
   // prompt will be shown (i.e. the current origin in the tab_contents doesn't
   // have a saved permission).
   bool GetUserMediaAndAccept(content::WebContents* tab_contents) const;
+  bool GetUserMediaAndAcceptIfPrompted(
+      content::WebContents* tab_contents) const;
   bool GetUserMediaWithSpecificConstraintsAndAccept(
       content::WebContents* tab_contents,
       const std::string& constraints) const;

chrome/browser/media/webrtc/webrtc_getmediadevices_browsertest.cc

@@ -114,8 +114,6 @@ class WebRtcGetMediaDevicesBrowserTest
       } else if (device.kind == kDeviceKindVideoInput) {
         found_video_input = true;
       }
-
-      EXPECT_FALSE(device.group_id.empty());
       devices->push_back(device);
     }
 
@@ -197,10 +195,12 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetMediaDevicesBrowserTest,
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(GetUserMediaAndAcceptIfPrompted(tab));
   std::vector<MediaDeviceInfo> devices;
   EnumerateDevices(tab, &devices);
 
   ui_test_utils::NavigateToURL(browser(), url);
+  EXPECT_TRUE(GetUserMediaAndAcceptIfPrompted(tab));
   std::vector<MediaDeviceInfo> devices2;
   EnumerateDevices(tab, &devices2);
 
@@ -227,6 +227,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetMediaDevicesBrowserTest,
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab1 =
       browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(GetUserMediaAndAcceptIfPrompted(tab1));
   std::vector<MediaDeviceInfo> devices;
   EnumerateDevices(tab1, &devices);
 
@@ -234,6 +235,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetMediaDevicesBrowserTest,
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab2 =
       browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(GetUserMediaAndAcceptIfPrompted(tab2));
   std::vector<MediaDeviceInfo> devices2;
   EnumerateDevices(tab2, &devices2);
 
@@ -303,6 +305,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetMediaDevicesBrowserTest,
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab2 =
       browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(GetUserMediaAndAcceptIfPrompted(tab2));
   std::vector<MediaDeviceInfo> devices2;
   EnumerateDevices(tab2, &devices2);
 
@@ -320,14 +323,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetMediaDevicesBrowserTest,
       ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
-
   EXPECT_TRUE(GetUserMediaAndAccept(tab));
-
   std::vector<MediaDeviceInfo> devices;
   EnumerateDevices(tab, &devices);
 
   ui_test_utils::NavigateToURL(browser(), url);
   tab = browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(GetUserMediaAndAcceptIfPrompted(tab));
   std::vector<MediaDeviceInfo> devices2;
   EnumerateDevices(tab, &devices2);
 

content/browser/webrtc/webrtc_video_capture_service_enumeration_browsertest.cc

@@ -48,6 +48,7 @@ struct TestParams {
 };
 
 static const char kVideoCaptureHtmlFile[] = "/media/video_capture_test.html";
+static const char kRequestDevicePermission[] = "requestDevicePermission()";
 static const char kEnumerateVideoCaptureDevicesAndVerify[] =
     "enumerateVideoCaptureDevicesAndVerifyCount(%d)";
 static const char kRegisterForDeviceChangeEvent[] =
@@ -170,6 +171,15 @@ class WebRtcVideoCaptureServiceEnumerationBrowserTest
     video_source_provider_.reset();
   }
 
+  void RequestDevicePermission() {
+    const std::string javascript_to_execute =
+        base::StringPrintf(kRequestDevicePermission);
+    std::string result;
+    ASSERT_TRUE(
+        ExecuteScriptAndExtractString(shell(), javascript_to_execute, &result));
+    ASSERT_EQ("OK", result);
+  }
+
   void EnumerateDevicesInRendererAndVerifyDeviceCount(
       int expected_device_count) {
     const std::string javascript_to_execute = base::StringPrintf(
@@ -249,6 +259,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoCaptureServiceEnumerationBrowserTest,
   ConnectToService();
 
   // Exercise
+  EnumerateDevicesInRendererAndVerifyDeviceCount(0);
   AddVirtualDevice("test");
   EnumerateDevicesInRendererAndVerifyDeviceCount(1);
 
@@ -263,6 +274,9 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoCaptureServiceEnumerationBrowserTest,
   ConnectToService();
 
   AddVirtualDevice("test_1");
+  // Request permission using getUserMedia() after adding the first device.
+  // Otherwise, getUserMedia() will fail with NotFoundError.
+  RequestDevicePermission();
   AddVirtualDevice("test_2");
   EnumerateDevicesInRendererAndVerifyDeviceCount(2);
   RemoveVirtualDevice("test_1");

content/test/data/media/getusermedia-depth-capture.html

@@ -21,14 +21,18 @@
   // run here because they require --use-fake-device-for-media-capture.
   function getDepthStreamAndCallCreateImageBitmap() {
     console.log('Calling getDepthStreamAndCallCreateImageBitmap');
-    getFake16bitStream().then((stream) => {
-      detectVideoInLocalView1(stream).then(() => {
-        testVideoToImageBitmap('local-view-1', function() {
-          stream.getVideoTracks()[0].stop();
-          detectVideoStopped('local-view-1')
-              .then(reportTestSuccess);
-        }, failedCallback);
-      });
+    // Call getUserMedia() to allow device enumerations.
+    navigator.mediaDevices.getUserMedia({video:true}).then(stream => {
+      stream.getTracks().forEach(track => track.stop());
+      getFake16bitStream().then(stream => {
+        detectVideoInLocalView1(stream).then(() => {
+          testVideoToImageBitmap('local-view-1', function() {
+            stream.getVideoTracks()[0].stop();
+            detectVideoStopped('local-view-1')
+                .then(reportTestSuccess);
+          }, failedCallback);
+        });
+      }, failedCallback);
     }, failedCallback);
   }
 
@@ -421,12 +425,16 @@
     var query = /query=(.*)/.exec(window.location.href);
     if (!query)
       return;
-    if (query[1] == "RGBAUint8")
-      depthStreamToRGBAUint8Texture();
-    else if (query[1] == "RGBAFloat")
-      depthStreamToRGBAFloatTexture();
-    else if (query[1] == "R32Float")
-      depthStreamToR32FloatTexture();
+    // Call getUserMedia() first to allow device enumerations.
+    navigator.mediaDevices.getUserMedia({video: true}).then(stream => {
+      stream.getTracks().forEach(track => track.stop());
+      if (query[1] == "RGBAUint8")
+        depthStreamToRGBAUint8Texture();
+      else if (query[1] == "RGBAFloat")
+        depthStreamToRGBAFloatTexture();
+      else if (query[1] == "R32Float")
+        depthStreamToR32FloatTexture();
+    }, failedCallback);
   }
   </script>
 </head>

content/test/data/media/getusermedia.html

@@ -18,11 +18,16 @@
       window.addEventListener('click', runFunctionOnClick);
   });
 
-  function getSources() {
-    navigator.mediaDevices.enumerateDevices().then(function(devices) {
+  async function getSources() {
+    try {
+      // Call getUserMedia() to allow exposing devices in enumerateDevices.
+      let stream = await navigator.mediaDevices.getUserMedia(
+          {audio:true, video:true});
+      stream.getTracks().forEach(track => track.stop());
+      let devices = await navigator.mediaDevices.enumerateDevices();
       document.title = 'Media devices available';
-      var results = [];
-      for (var device, i = 0; device = devices[i]; ++i) {
+      let results = [];
+      for (let device, i = 0; device = devices[i]; ++i) {
         if (device.kind != "audioinput" && device.kind != "videoinput")
           continue;
         results.push({
@@ -33,7 +38,9 @@
         });
       }
       sendValueToTest(JSON.stringify(results));
-    });
+    } catch (e) {
+      failTest();
+    }
   }
 
   // Creates a MediaStream and renders it locally. When the video is detected to
@@ -446,19 +453,18 @@
     var detectorInterval = setInterval(detectorFunction, 50);
   }
 
-  function getAudioSettingsDefault() {
-    navigator.mediaDevices.getUserMedia({audio:true})
-      .then(stream => {
-        assertEquals(stream.getAudioTracks().length, 1);
-        var settings = stream.getAudioTracks()[0].getSettings();
-        assertEquals(settings.deviceId, 'default');
-        assertTrue(settings.echoCancellation);
-        stream.getAudioTracks()[0].stop();
-        reportTestSuccess();
-      })
-      .catch(_ => {
-        failTest("getUserMedia failed")
-      });
+  async function getAudioSettingsDefault() {
+    try {
+      let stream = await navigator.mediaDevices.getUserMedia({audio:true});
+      assertEquals(stream.getAudioTracks().length, 1);
+      let settings = stream.getAudioTracks()[0].getSettings();
+      assertEquals(settings.deviceId, 'default');
+      assertTrue(settings.echoCancellation);
+      stream.getAudioTracks()[0].stop();
+      reportTestSuccess();
+    } catch (e) {
+        failTest("Error: " + e);
+    }
   }
 
   function getAudioSettingsNoEchoCancellation() {
@@ -476,28 +482,30 @@
       });
   }
 
-  function getAudioSettingsDeviceId() {
-    navigator.mediaDevices.enumerateDevices()
-      .then(devices => {
-        var last_device_id;
-        for (var device, i = 0; device = devices[i]; ++i) {
-          if (device.kind != "audioinput")
-            continue;
-          last_device_id = device.deviceId;
-        }
-        navigator.mediaDevices.getUserMedia(
-          {audio:{deviceId: {exact: last_device_id}}})
-          .then(stream => {
-            assertEquals(stream.getAudioTracks().length, 1);
-            var settings = stream.getAudioTracks()[0].getSettings();
-            assertEquals(settings.deviceId, last_device_id);
-            assertNotEquals(settings.deviceId, 'default');
-            assertTrue(settings.echoCancellation);
-            stream.getAudioTracks()[0].stop();
-            reportTestSuccess();
-          })
-      })
-      .catch(failTest);
+  async function getAudioSettingsDeviceId() {
+    try {
+      // Plain getUserMedia() call to enable device enumeration.
+      let stream = await navigator.mediaDevices.getUserMedia({audio:true});
+      stream.getAudioTracks()[0].stop();
+      let devices = await navigator.mediaDevices.enumerateDevices();
+      let last_device_id;
+      for (let device, i = 0; device = devices[i]; ++i) {
+        if (device.kind != "audioinput")
+          continue;
+        last_device_id = device.deviceId;
+      }
+      stream = await navigator.mediaDevices.getUserMedia(
+          {audio:{deviceId: {exact: last_device_id}}});
+      assertEquals(stream.getAudioTracks().length, 1);
+      var settings = stream.getAudioTracks()[0].getSettings();
+      assertEquals(settings.deviceId, last_device_id);
+      assertNotEquals(settings.deviceId, 'default');
+      assertTrue(settings.echoCancellation);
+      stream.getAudioTracks()[0].stop();
+      reportTestSuccess();
+    } catch (e) {
+      failTest('Error: ' + e);
+    }
   }
 
   function srcObjectAddVideoTrack() {

content/test/data/media/video_capture_test.js

@@ -10,7 +10,6 @@ var hasReceivedTrackEndedEvent = false;
 var hasReceivedDeviceChangeEventReceived = false;
 
 function startVideoCaptureAndVerifySize(video_width, video_height) {
-  console.log('Calling getUserMediaAndWaitForVideoRendering.');
   var constraints = {
     video: {
       width: {exact: video_width},
@@ -27,47 +26,56 @@ function startVideoCaptureAndVerifySize(video_width, video_height) {
 
 function startVideoCaptureFromVirtualDeviceAndVerifyUniformColorVideoWithSize(
     video_width, video_height) {
-  console.log('Trying to find device named "Virtual Device".');
-  navigator.mediaDevices.enumerateDevices().then(function(devices) {
-    var target_device;
-    devices.forEach(function(device) {
-      if (device.kind == 'videoinput') {
-        console.log('Found videoinput device with label ' + device.label);
-        if (device.label == 'Virtual Device') {
-          target_device = device;
+  navigator.mediaDevices.getUserMedia({video: true}).then(stream => {
+    stream.getTracks().forEach(track => track.stop());
+    navigator.mediaDevices.enumerateDevices().then(function(devices) {
+      var target_device;
+      devices.forEach(function(device) {
+        if (device.kind == 'videoinput') {
+          if (device.label == 'Virtual Device') {
+            target_device = device;
+          }
         }
+      });
+      if (target_device == null) {
+        failTest(
+            'No video input device was found with label = Virtual ' +
+            'Device');
+        return;
       }
+      var device_specific_constraints = {
+        video: {
+          width: {exact: video_width},
+          height: {exact: video_height},
+          deviceId: {exact: target_device.deviceId}
+        }
+      };
+      navigator.mediaDevices.getUserMedia(device_specific_constraints)
+          .then(function(stream) {
+            waitForVideoStreamToSatisfyRequirementFunction(
+                stream, detectUniformColorVideoWithDimensionPlaying,
+                video_width, video_height);
+          })
+          .catch(failedCallback);
     });
-    if (target_device == null) {
-      failTest(
-          'No video input device was found with label = Virtual ' +
-          'Device');
-      return;
-    }
-    var device_specific_constraints = {
-      video: {
-        width: {exact: video_width},
-        height: {exact: video_height},
-        deviceId: {exact: target_device.deviceId}
-      }
-    };
-    navigator.mediaDevices.getUserMedia(device_specific_constraints)
-        .then(function(stream) {
-          waitForVideoStreamToSatisfyRequirementFunction(
-              stream, detectUniformColorVideoWithDimensionPlaying, video_width,
-              video_height);
-        })
-        .catch(failedCallback);
+  }).catch(failedCallback);
+}
+
+function requestDevicePermission() {
+  navigator.mediaDevices.getUserMedia({video:true}).then(stream => {
+    stream.getTracks().forEach(track => track.stop());
+    reportTestSuccess();
+  },
+  e => {
+    failTest(e);
   });
 }
 
 function enumerateVideoCaptureDevicesAndVerifyCount(expected_count) {
-  console.log('Enumerating devices and verifying count.');
   navigator.mediaDevices.enumerateDevices().then(function(devices) {
     var actual_count = 0;
     devices.forEach(function(device) {
       if (device.kind == 'videoinput') {
-        console.log('Found videoinput device with label ' + device.label);
         actual_count = actual_count + 1;
       }
     });

third_party/blink/renderer/modules/mediastream/media_devices.cc

@@ -31,6 +31,9 @@
 
 namespace blink {
 
+const base::Feature kEnumerateRequiresGetUserMedia{
+    "EnumerateRequiresGetUserMedia", base::FEATURE_ENABLED_BY_DEFAULT};
+
 namespace {
 
 class PromiseResolverCallbacks final : public UserMediaRequest::Callbacks {
@@ -115,12 +118,17 @@ ScriptPromise MediaDevices::SendUserMediaRequest(
 
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
   auto* callbacks = MakeGarbageCollected<PromiseResolverCallbacks>(resolver);
-
+  base::OnceClosure success_update_callback;
+  if (media_type == UserMediaRequest::MediaType::kUserMedia) {
+    success_update_callback = WTF::Bind(
+        &MediaDevices::SetEnumerateCanExposeDevices, WrapWeakPersistent(this));
+  }
   LocalDOMWindow* window = LocalDOMWindow::From(script_state);
   UserMediaController* user_media = UserMediaController::From(window);
   MediaErrorState error_state;
   UserMediaRequest* request = UserMediaRequest::Create(
-      window, user_media, media_type, options, callbacks, error_state);
+      window, user_media, media_type, options, callbacks,
+      std::move(success_update_callback), error_state);
   if (!request) {
     DCHECK(error_state.HadException());
     if (error_state.CanGenerateException()) {
@@ -295,6 +303,12 @@ void MediaDevices::DevicesEnumerated(
     for (wtf_size_t j = 0; j < enumeration[i].size(); ++j) {
       mojom::blink::MediaDeviceType device_type =
           static_cast<mojom::blink::MediaDeviceType>(i);
+      if (base::FeatureList::IsEnabled(kEnumerateRequiresGetUserMedia) &&
+          !enumerate_can_expose_devices_) {
+        media_devices.push_back(MakeGarbageCollected<MediaDeviceInfo>(
+            String(), String(), String(), device_type));
+        break;
+      }
       WebMediaDeviceInfo device_info = enumeration[i][j];
       if (device_type == mojom::blink::MediaDeviceType::MEDIA_AUDIO_INPUT ||
           device_type == mojom::blink::MediaDeviceType::MEDIA_VIDEO_INPUT) {
@@ -363,6 +377,10 @@ void MediaDevices::SetDispatcherHostForTesting(
                 WrapWeakPersistent(this)));
 }
 
+void MediaDevices::SetEnumerateCanExposeDevices() {
+  enumerate_can_expose_devices_ = true;
+}
+
 void MediaDevices::Trace(Visitor* visitor) const {
   visitor->Trace(receiver_);
   visitor->Trace(scheduled_events_);

third_party/blink/renderer/modules/mediastream/media_devices.h

@@ -6,6 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_DEVICES_H_
 
 #include "base/callback.h"
+#include "base/feature_list.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/mojom/mediastream/media_devices.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
@@ -29,6 +30,8 @@ class ScriptPromise;
 class ScriptPromiseResolver;
 class ScriptState;
 
+extern const base::Feature kEnumerateRequiresGetUserMedia;
+
 class MODULES_EXPORT MediaDevices final
     : public EventTargetWithInlineData,
       public ActiveScriptWrappable<MediaDevices>,
@@ -70,6 +73,8 @@ class MODULES_EXPORT MediaDevices final
   void OnDevicesChanged(MediaDeviceType,
                         const Vector<WebMediaDeviceInfo>&) override;
 
+  void SetEnumerateCanExposeDevices();
+
   // Callback for testing only.
   using EnumerateDevicesTestCallback =
       base::OnceCallback<void(const MediaDeviceInfoVector&)>;
@@ -127,6 +132,7 @@ class MODULES_EXPORT MediaDevices final
   EnumerateDevicesTestCallback enumerate_devices_test_callback_;
   base::OnceClosure connection_error_test_callback_;
   base::OnceClosure device_change_test_callback_;
+  bool enumerate_can_expose_devices_ = false;
 };
 
 }  // namespace blink

third_party/blink/renderer/modules/mediastream/media_devices_test.cc

@@ -11,9 +11,13 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/renderer/bindings/core/v8/native_value_traits.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_function.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
+#include "third_party/blink/renderer/bindings/core/v8/script_promise_tester.h"
+#include "third_party/blink/renderer/bindings/core/v8/script_value.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_media_device_info.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_media_stream_constraints.h"
 #include "third_party/blink/renderer/core/testing/null_execution_context.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
@@ -24,6 +28,8 @@ using blink::mojom::blink::MediaDeviceInfoPtr;
 
 namespace blink {
 
+namespace {
+
 const char kFakeAudioInputDeviceId1[] = "fake_audio_input 1";
 const char kFakeAudioInputDeviceId2[] = "fake_audio_input 2";
 const char kFakeVideoInputDeviceId1[] = "fake_video_input 1";
@@ -158,11 +164,29 @@ class MockMediaDevicesDispatcherHost
   mojo::Receiver<mojom::blink::MediaDevicesDispatcherHost> receiver_{this};
 };
 
+MediaDeviceInfoVector ToMediaDeviceInfoVector(
+    const v8::Local<v8::Value>& value) {
+  EXPECT_TRUE(value->IsArray());
+  v8::Array& array = *v8::Array::Cast(*value);
+  v8::Local<v8::Context> context =
+      v8::Isolate::GetCurrent()->GetCurrentContext();
+
+  MediaDeviceInfoVector device_infos;
+  for (uint32_t i = 0; i < array.Length(); ++i) {
+    MediaDeviceInfo* device_info = V8MediaDeviceInfo::ToImplWithTypeCheck(
+        context->GetIsolate(), array.Get(context, i).ToLocalChecked());
+    device_infos.push_back(device_info);
+  }
+  return device_infos;
+}
+
+}  // namespace
+
 class MediaDevicesTest : public testing::Test {
  public:
   using MediaDeviceInfos = HeapVector<Member<MediaDeviceInfo>>;
 
-  MediaDevicesTest() : device_infos_(MakeGarbageCollected<MediaDeviceInfos>()) {
+  MediaDevicesTest() {
     dispatcher_host_ = std::make_unique<MockMediaDevicesDispatcherHost>();
   }
 
@@ -183,15 +207,6 @@ class MediaDevicesTest : public testing::Test {
                                  Vector<WebMediaDeviceInfo>());
   }
 
-  void DevicesEnumerated(const MediaDeviceInfoVector& device_infos) {
-    devices_enumerated_ = true;
-    for (wtf_size_t i = 0; i < device_infos.size(); i++) {
-      device_infos_->push_back(MakeGarbageCollected<MediaDeviceInfo>(
-          device_infos[i]->deviceId(), device_infos[i]->label(),
-          device_infos[i]->groupId(), device_infos[i]->DeviceType()));
-    }
-  }
-
   void OnDispatcherHostConnectionError() {
     dispatcher_host_connection_error_ = true;
   }
@@ -209,10 +224,6 @@ class MediaDevicesTest : public testing::Test {
 
   bool listener_connection_error() const { return listener_connection_error_; }
 
-  const MediaDeviceInfos& device_infos() const { return *device_infos_; }
-
-  bool devices_enumerated() const { return devices_enumerated_; }
-
   bool dispatcher_host_connection_error() const {
     return dispatcher_host_connection_error_;
   }
@@ -226,8 +237,6 @@ class MediaDevicesTest : public testing::Test {
  private:
   ScopedTestingPlatformSupport<TestingPlatformSupport> platform_;
   std::unique_ptr<MockMediaDevicesDispatcherHost> dispatcher_host_;
-  Persistent<MediaDeviceInfos> device_infos_;
-  bool devices_enumerated_ = false;
   bool dispatcher_host_connection_error_ = false;
   bool device_changed_ = false;
   bool listener_connection_error_ = false;
@@ -251,61 +260,76 @@ TEST_F(MediaDevicesTest, GetUserMediaCanBeCalled) {
 TEST_F(MediaDevicesTest, EnumerateDevices) {
   V8TestingScope scope;
   auto* media_devices = GetMediaDevices(scope.GetExecutionContext());
-  media_devices->SetEnumerateDevicesCallbackForTesting(
-      WTF::Bind(&MediaDevicesTest::DevicesEnumerated, WTF::Unretained(this)));
   ScriptPromise promise = media_devices->enumerateDevices(
       scope.GetScriptState(), scope.GetExceptionState());
-  platform()->RunUntilIdle();
-  ASSERT_FALSE(promise.IsEmpty());
+  ScriptPromiseTester tester(scope.GetScriptState(), promise);
+  tester.WaitUntilSettled();
+  ASSERT_TRUE(tester.IsFulfilled());
+  MediaDeviceInfoVector device_infos =
+      ToMediaDeviceInfoVector(tester.Value().V8Value());
+
+  // One empty device per kind, since enumerateDevices() cannot expose device
+  // info by default.
+  EXPECT_EQ(device_infos.size(), 3u);
+  for (auto device : device_infos) {
+    EXPECT_TRUE(device->deviceId().IsEmpty());
+    EXPECT_TRUE(device->label().IsEmpty());
+  }
 
-  EXPECT_TRUE(devices_enumerated());
-  EXPECT_EQ(5u, device_infos().size());
+  // Authorize enumerateDevices() to expose device info.
+  media_devices->SetEnumerateCanExposeDevices();
+  promise = media_devices->enumerateDevices(scope.GetScriptState(),
+                                            scope.GetExceptionState());
+  ScriptPromiseTester tester2(scope.GetScriptState(), promise);
+  tester2.WaitUntilSettled();
+  ASSERT_TRUE(tester2.IsFulfilled());
+
+  device_infos = ToMediaDeviceInfoVector(tester2.Value().V8Value());
+  EXPECT_EQ(device_infos.size(), 5u);
 
   // Audio input device with matched output ID.
-  Member<MediaDeviceInfo> device = device_infos()[0];
+  MediaDeviceInfo* device = device_infos[0];
   EXPECT_FALSE(device->deviceId().IsEmpty());
   EXPECT_EQ("audioinput", device->kind());
   EXPECT_FALSE(device->label().IsEmpty());
   EXPECT_FALSE(device->groupId().IsEmpty());
 
   // Audio input device without matched output ID.
-  device = device_infos()[1];
+  device = device_infos[1];
   EXPECT_FALSE(device->deviceId().IsEmpty());
   EXPECT_EQ("audioinput", device->kind());
   EXPECT_FALSE(device->label().IsEmpty());
   EXPECT_FALSE(device->groupId().IsEmpty());
 
   // Video input devices.
-  device = device_infos()[2];
+  device = device_infos[2];
   EXPECT_FALSE(device->deviceId().IsEmpty());
   EXPECT_EQ("videoinput", device->kind());
   EXPECT_FALSE(device->label().IsEmpty());
   EXPECT_FALSE(device->groupId().IsEmpty());
 
-  device = device_infos()[3];
+  device = device_infos[3];
   EXPECT_FALSE(device->deviceId().IsEmpty());
   EXPECT_EQ("videoinput", device->kind());
   EXPECT_FALSE(device->label().IsEmpty());
   EXPECT_FALSE(device->groupId().IsEmpty());
 
   // Audio output device.
-  device = device_infos()[4];
+  device = device_infos[4];
   EXPECT_FALSE(device->deviceId().IsEmpty());
   EXPECT_EQ("audiooutput", device->kind());
   EXPECT_FALSE(device->label().IsEmpty());
   EXPECT_FALSE(device->groupId().IsEmpty());
 
   // Verify group IDs.
-  EXPECT_EQ(device_infos()[0]->groupId(), device_infos()[2]->groupId());
-  EXPECT_EQ(device_infos()[0]->groupId(), device_infos()[4]->groupId());
-  EXPECT_NE(device_infos()[1]->groupId(), device_infos()[4]->groupId());
+  EXPECT_EQ(device_infos[0]->groupId(), device_infos[2]->groupId());
+  EXPECT_EQ(device_infos[0]->groupId(), device_infos[4]->groupId());
+  EXPECT_NE(device_infos[1]->groupId(), device_infos[4]->groupId());
 }
 
 TEST_F(MediaDevicesTest, EnumerateDevicesAfterConnectionError) {
   V8TestingScope scope;
   auto* media_devices = GetMediaDevices(scope.GetExecutionContext());
-  media_devices->SetEnumerateDevicesCallbackForTesting(
-      WTF::Bind(&MediaDevicesTest::DevicesEnumerated, WTF::Unretained(this)));
   media_devices->SetConnectionErrorCallbackForTesting(
       WTF::Bind(&MediaDevicesTest::OnDispatcherHostConnectionError,
                 WTF::Unretained(this)));
@@ -317,17 +341,16 @@ TEST_F(MediaDevicesTest, EnumerateDevicesAfterConnectionError) {
 
   ScriptPromise promise = media_devices->enumerateDevices(
       scope.GetScriptState(), scope.GetExceptionState());
-  platform()->RunUntilIdle();
-  ASSERT_FALSE(promise.IsEmpty());
+  ScriptPromiseTester tester(scope.GetScriptState(), promise);
+  tester.WaitUntilSettled();
+  EXPECT_TRUE(tester.IsRejected());
+  EXPECT_FALSE(promise.IsEmpty());
   EXPECT_TRUE(dispatcher_host_connection_error());
-  EXPECT_FALSE(devices_enumerated());
 }
 
 TEST_F(MediaDevicesTest, EnumerateDevicesBeforeConnectionError) {
   V8TestingScope scope;
   auto* media_devices = GetMediaDevices(scope.GetExecutionContext());
-  media_devices->SetEnumerateDevicesCallbackForTesting(
-      WTF::Bind(&MediaDevicesTest::DevicesEnumerated, WTF::Unretained(this)));
   media_devices->SetConnectionErrorCallbackForTesting(
       WTF::Bind(&MediaDevicesTest::OnDispatcherHostConnectionError,
                 WTF::Unretained(this)));
@@ -335,14 +358,15 @@ TEST_F(MediaDevicesTest, EnumerateDevicesBeforeConnectionError) {
 
   ScriptPromise promise = media_devices->enumerateDevices(
       scope.GetScriptState(), scope.GetExceptionState());
-  platform()->RunUntilIdle();
+  ScriptPromiseTester tester(scope.GetScriptState(), promise);
+  tester.WaitUntilSettled();
+  EXPECT_TRUE(tester.IsFulfilled());
   ASSERT_FALSE(promise.IsEmpty());
 
   // Simulate a connection error by closing the binding.
   CloseBinding();
   platform()->RunUntilIdle();
   EXPECT_TRUE(dispatcher_host_connection_error());
-  EXPECT_TRUE(devices_enumerated());
 }
 
 TEST_F(MediaDevicesTest, ObserveDeviceChangeEvent) {

third_party/blink/renderer/modules/mediastream/navigator_media_stream.cc

@@ -31,7 +31,9 @@
 #include "third_party/blink/renderer/core/frame/navigator.h"
 #include "third_party/blink/renderer/core/frame/settings.h"
 #include "third_party/blink/renderer/core/page/page.h"
+#include "third_party/blink/renderer/modules/mediastream/media_devices.h"
 #include "third_party/blink/renderer/modules/mediastream/media_error_state.h"
+#include "third_party/blink/renderer/modules/mediastream/navigator_user_media.h"
 #include "third_party/blink/renderer/modules/mediastream/user_media_controller.h"
 #include "third_party/blink/renderer/modules/mediastream/user_media_request.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
@@ -56,10 +58,14 @@ void NavigatorMediaStream::getUserMedia(
 
   UserMediaController* user_media =
       UserMediaController::From(navigator.DomWindow());
+  MediaDevices* media_devices = NavigatorUserMedia::mediaDevices(navigator);
   MediaErrorState error_state;
-  UserMediaRequest* request =
-      UserMediaRequest::Create(navigator.DomWindow(), user_media, options,
-                               success_callback, error_callback, error_state);
+  UserMediaRequest* request = UserMediaRequest::Create(
+      navigator.DomWindow(), user_media, options, success_callback,
+      error_callback,
+      WTF::Bind(&MediaDevices::SetEnumerateCanExposeDevices,
+                WrapWeakPersistent(media_devices)),
+      error_state);
   if (!request) {
     DCHECK(error_state.HadException());
     if (error_state.CanGenerateException()) {

third_party/blink/renderer/modules/mediastream/user_media_request.cc

@@ -330,6 +330,7 @@ UserMediaRequest* UserMediaRequest::Create(
     UserMediaRequest::MediaType media_type,
     const MediaStreamConstraints* options,
     Callbacks* callbacks,
+    base::OnceClosure success_update_callback,
     MediaErrorState& error_state) {
   MediaConstraints audio = ParseOptions(context, options->audio(), error_state);
   if (error_state.HadException())
@@ -394,8 +395,9 @@ UserMediaRequest* UserMediaRequest::Create(
   if (!video.IsNull())
     CountVideoConstraintUses(context, video);
 
-  return MakeGarbageCollected<UserMediaRequest>(context, controller, media_type,
-                                                audio, video, callbacks);
+  return MakeGarbageCollected<UserMediaRequest>(
+      context, controller, media_type, audio, video, callbacks,
+      std::move(success_update_callback));
 }
 
 UserMediaRequest* UserMediaRequest::Create(
@@ -404,11 +406,12 @@ UserMediaRequest* UserMediaRequest::Create(
     const MediaStreamConstraints* options,
     V8NavigatorUserMediaSuccessCallback* success_callback,
     V8NavigatorUserMediaErrorCallback* error_callback,
+    base::OnceClosure success_update_callback,
     MediaErrorState& error_state) {
   return Create(
       context, controller, UserMediaRequest::MediaType::kUserMedia, options,
       MakeGarbageCollected<V8Callbacks>(success_callback, error_callback),
-      error_state);
+      std::move(success_update_callback), error_state);
 }
 
 UserMediaRequest* UserMediaRequest::CreateForTesting(
@@ -416,7 +419,7 @@ UserMediaRequest* UserMediaRequest::CreateForTesting(
     const MediaConstraints& video) {
   return MakeGarbageCollected<UserMediaRequest>(
       nullptr, nullptr, UserMediaRequest::MediaType::kUserMedia, audio, video,
-      nullptr);
+      nullptr, base::OnceClosure());
 }
 
 UserMediaRequest::UserMediaRequest(ExecutionContext* context,
@@ -424,7 +427,8 @@ UserMediaRequest::UserMediaRequest(ExecutionContext* context,
                                    UserMediaRequest::MediaType media_type,
                                    MediaConstraints audio,
                                    MediaConstraints video,
-                                   Callbacks* callbacks)
+                                   Callbacks* callbacks,
+                                   base::OnceClosure success_update_callback)
     : ExecutionContextLifecycleObserver(context),
       media_type_(media_type),
       audio_(audio),
@@ -433,7 +437,8 @@ UserMediaRequest::UserMediaRequest(ExecutionContext* context,
           RuntimeEnabledFeatures::DisableHardwareNoiseSuppressionEnabled(
               context)),
       controller_(controller),
-      callbacks_(callbacks) {
+      callbacks_(callbacks),
+      success_update_callback_(std::move(success_update_callback)) {
   if (should_disable_hardware_noise_suppression_) {
     UseCounter::Count(context,
                       WebFeature::kUserMediaDisableHardwareNoiseSuppression);
@@ -533,6 +538,8 @@ void UserMediaRequest::OnMediaStreamInitialized(MediaStream* stream) {
   for (const auto& video_track : video_tracks)
     video_track->SetConstraints(video_);
 
+  if (success_update_callback_)
+    std::move(success_update_callback_).Run();
   callbacks_->OnSuccess(nullptr, stream);
   is_resolved_ = true;
 }

third_party/blink/renderer/modules/mediastream/user_media_request.h

@@ -96,12 +96,14 @@ class MODULES_EXPORT UserMediaRequest final
                                   MediaType media_type,
                                   const MediaStreamConstraints* options,
                                   Callbacks*,
+                                  base::OnceClosure success_update_callback,
                                   MediaErrorState&);
   static UserMediaRequest* Create(ExecutionContext*,
                                   UserMediaController*,
                                   const MediaStreamConstraints* options,
                                   V8NavigatorUserMediaSuccessCallback*,
                                   V8NavigatorUserMediaErrorCallback*,
+                                  base::OnceClosure success_update_callback,
                                   MediaErrorState&);
   static UserMediaRequest* CreateForTesting(const MediaConstraints& audio,
                                             const MediaConstraints& video);
@@ -111,7 +113,8 @@ class MODULES_EXPORT UserMediaRequest final
                    MediaType media_type,
                    MediaConstraints audio,
                    MediaConstraints video,
-                   Callbacks*);
+                   Callbacks*,
+                   base::OnceClosure success_update_callback);
   virtual ~UserMediaRequest();
 
   LocalDOMWindow* GetWindow();
@@ -163,6 +166,7 @@ class MODULES_EXPORT UserMediaRequest final
   Member<UserMediaController> controller_;
 
   Member<Callbacks> callbacks_;
+  base::OnceClosure success_update_callback_;
   bool is_resolved_ = false;
 };
 

third_party/blink/web_tests/external/wpt/audio-output/setSinkId.https.html

@@ -17,6 +17,8 @@ promise_test(t => promise_rejects_dom(t, "NotFoundError", audio.setSinkId("nonex
   "setSinkId fails with NotFoundError on made up deviceid");
 
 promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  stream.getAudioTracks()[0].stop();
   const list = await navigator.mediaDevices.enumerateDevices();
   const outputDevicesList = list.filter(({kind}) => kind == "audiooutput");
   assert_not_equals(outputDevicesList.length, 0,

third_party/blink/web_tests/external/wpt/mediacapture-streams/MediaDevices-enumerateDevices.https-expected.txt

-This is a testharness.js-based test.
-FAIL mediaDevices.enumerateDevices() is present and working - before capture assert_equals: mediaInfo's deviceId should exist and be empty if getUserMedia was never called successfully. expected "" but got "default"
-PASS mediaDevices.enumerateDevices() is present and working - after capture
-PASS InputDeviceInfo is supported
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/mediacapture-streams/MediaDevices-getUserMedia.https.html

@@ -40,6 +40,8 @@ test(function () {
 promise_test(async t => {
   assert_true(navigator.mediaDevices.getSupportedConstraints()["groupId"],
     "groupId should be supported");
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  stream.getVideoTracks()[0].stop();
   const devices = await navigator.mediaDevices.enumerateDevices();
   for (const device of devices) {
     await navigator.mediaDevices.getUserMedia(
@@ -63,6 +65,8 @@ promise_test(async t => {
 promise_test(async t => {
   assert_true(navigator.mediaDevices.getSupportedConstraints()["groupId"],
     "groupId should be supported");
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  stream.getAudioTracks()[0].stop();
   const devices = await navigator.mediaDevices.enumerateDevices();
   for (const device of devices) {
     await navigator.mediaDevices.getUserMedia(

third_party/blink/web_tests/external/wpt/mediacapture-streams/idlharness.https.window.js

@@ -13,6 +13,8 @@ idl_test(
     const inputDevices = [];
     const outputDevices = [];
     try {
+      const stream = await navigator.mediaDevices.getUserMedia({audio:true, video:true});
+      stream.getTracks().forEach(track => track.stop());
       const list = await navigator.mediaDevices.enumerateDevices();
       for (const device of list) {
         if (device.kind in self) {

third_party/blink/web_tests/fast/mediastream/MediaDevices-enumerateDevices-iframe.html

@@ -16,20 +16,23 @@
 var t = async_test(
   "Result of enumerateDevices() on an iframe matches that of the main frame",
    {timeout: 4000});
-var iframe = document.createElement('iframe');
+let iframe = document.createElement('iframe');
 window.onmessage = t.step_func(event => {
   if (event.source != iframe.contentWindow)
     return;
 
-  var iframe_devices = JSON.parse(event.data);
-  navigator.mediaDevices.enumerateDevices().then(main_devices => {
-    assert_equals(main_devices.length, iframe_devices.length);
-    for (var i = 0; i < main_devices.length; i++) {
-      assert_not_equals(main_devices[i].groupId, iframe_devices[i].groupId);
-      assert_equals(main_devices[i].kind, iframe_devices[i].kind);
-      assert_equals(main_devices[i].label, iframe_devices[i].label);
-    }
-    t.done();
+  let iframe_devices = JSON.parse(event.data);
+  navigator.mediaDevices.getUserMedia({audio:true, video:true}).then(stream => {
+    stream.getTracks().forEach(track => track.stop());
+    navigator.mediaDevices.enumerateDevices().then(main_devices => {
+      assert_equals(main_devices.length, iframe_devices.length);
+      for (let i = 0; i < main_devices.length; i++) {
+        assert_not_equals(main_devices[i].groupId, iframe_devices[i].groupId);
+        assert_equals(main_devices[i].kind, iframe_devices[i].kind);
+        assert_equals(main_devices[i].label, iframe_devices[i].label);
+      }
+      t.done();
+    });
   });
 });
 

third_party/blink/web_tests/fast/mediastream/resources/MediaDevices-enumerateDevices-iframe-child.html

 <script>
-  navigator.mediaDevices.enumerateDevices().then(devices => {
-    window.parent.postMessage(JSON.stringify(devices), "*");
+  navigator.mediaDevices.getUserMedia({audio:true, video:true}).then(stream => {
+    stream.getTracks().forEach(track => track.stop());
+    navigator.mediaDevices.enumerateDevices().then(devices => {
+      window.parent.postMessage(JSON.stringify(devices), "*");
+    });
   });
 </script>