Desktop Capture API: Pass Audio Selection Information To Javascript

chrome/test/data/extensions/api_test/desktop_capture/test.js

 // Copyright 2013 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.
 
-function onPickerResult(request_audio, audio_track_num, id) {
+function onPickerResult(audio_track_num, id, options) {
   chrome.test.assertEq("string", typeof id);
   chrome.test.assertTrue(id != "");
   var video_constraint = { mandatory: { chromeMediaSource: "desktop",
                                         chromeMediaSourceId: id } };
-  var audio_constraint = request_audio ? video_constraint : false;
-  navigator.webkitGetUserMedia({
+  var audio_constraint =
+    options.canRequestAudioTrack ? video_constraint : false;
+
+  navigator.mediaDevices.getUserMedia({
     audio: audio_constraint,
     video: video_constraint
-  },
+  }).then(
     function(stream) {
       if (audio_track_num != null)
         chrome.test.assertEq(audio_track_num, stream.getAudioTracks().length);
       chrome.test.succeed();
-  }, chrome.test.fail);
+  }).catch(chrome.test.fail);
 }
 
 // We can support audio for screen share on Windows. For ChromeOS, it depends
 // on whether USE_CRAS is on or not, thus we disable the check here. We cannot
 // support audio on other platforms.
 var expected_audio_tracks_for_screen_share = 0;
 if (navigator.appVersion.indexOf("Windows") != -1)
   expected_audio_tracks_for_screen_share = 1;
 else if (navigator.appVersion.indexOf("CrOS") != -1)
   expected_audio_tracks_for_screen_share = null;
@@ skipping 35 matching lines @@
   },
 
   function windowsOnly() {
     chrome.desktopCapture.chooseDesktopMedia(
         ["window"], chrome.test.callbackPass(function(id) {}));
   },
 
   function tabOnly() {
     chrome.desktopCapture.chooseDesktopMedia(
         ["tab"],
-        chrome.test.succeed);
+        chrome.test.callbackPass(function(id) {}));
   },
 
-  function audioShare() {
+  function audioShareNoApproval() {
     chrome.desktopCapture.chooseDesktopMedia(
         ["screen", "window", "tab", "audio"],
-        chrome.test.succeed);
+        chrome.test.callbackPass(function(id, options) {
+          chrome.test.assertEq(false, options.canRequestAudioTrack);
+        }));
+  },
+
+  function audioShareApproval() {
+    chrome.desktopCapture.chooseDesktopMedia(
+        ["screen", "window", "tab", "audio"],
+        chrome.test.callbackPass(function(id, options) {
+          chrome.test.assertEq(true, options.canRequestAudioTrack);
+        }));
   },
 
   // Show window picker and then get the selected stream using
   // getUserMedia().
   function chooseMediaAndGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
-        ["screen", "window"], onPickerResult.bind(undefined, false, 0));
+        ["screen", "window"], onPickerResult.bind(undefined, 0));
   },
 
   // Same as above but attempts to specify invalid source id.
   function chooseMediaAndTryGetStreamWithInvalidId() {
     function onPickerResult(id) {
       navigator.webkitGetUserMedia({
         audio: false,
         video: { mandatory: { chromeMediaSource: "desktop",
                               chromeMediaSourceId: id + "x" } }
       }, chrome.test.fail, chrome.test.succeed);
@@ skipping 18 matching lines @@
   // In detail:
   //  1. We cannot support audio for Window share;
   //  2. We can support audio for Tab share;
   //  3. We can support audio for Screen share on Windows;
   //  4. We can support audio for Screen Share on ChromeOS if USE_CRAS is on;
   //  5. To actually get audio track, user permission is always necessary;
   //  6. To actually get audio track, getUserMedia() should set audio
   //     constraint.
   function tabShareWithAudioPermissionGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
-        ["tab", "audio"], onPickerResult.bind(undefined, true, 1));
+        ["tab", "audio"], onPickerResult.bind(undefined, 1));
   },
 
   function windowShareWithAudioPermissionGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
-        ["window", "audio"], onPickerResult.bind(undefined, true, 0));
+        ["window", "audio"], onPickerResult.bind(undefined, 0));
   },
 
   function screenShareWithAudioPermissionGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
         ["screen", "audio"],
-        onPickerResult.bind(undefined, true,
+        onPickerResult.bind(undefined,
                             expected_audio_tracks_for_screen_share));
   },
 
   function tabShareWithoutAudioPermissionGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
-        ["tab", "audio"], onPickerResult.bind(undefined, true, 0));
+        ["tab", "audio"], onPickerResult.bind(undefined, 0));
   },
 
   function windowShareWithoutAudioPermissionGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
-        ["window", "audio"], onPickerResult.bind(undefined, true, 0));
+        ["window", "audio"], onPickerResult.bind(undefined, 0));
   },
 
   function screenShareWithoutAudioPermissionGetStream() {
     chrome.desktopCapture.chooseDesktopMedia(
-        ["screen", "audio"], onPickerResult.bind(undefined, true, 0));
+        ["screen", "audio"], onPickerResult.bind(undefined, 0));
   }
 ]);