| Index: chrome/test/data/extensions/api_test/desktop_capture/test.js
|
| diff --git a/chrome/test/data/extensions/api_test/desktop_capture/test.js b/chrome/test/data/extensions/api_test/desktop_capture/test.js
|
| index bdf3131048a12721601097d02ba957c1cfdbf0f5..6339fb09fd32ea76c87a1533bfa1e23cdc380bbe 100644
|
| --- a/chrome/test/data/extensions/api_test/desktop_capture/test.js
|
| +++ b/chrome/test/data/extensions/api_test/desktop_capture/test.js
|
| @@ -134,6 +134,23 @@ chrome.test.runTests([
|
| // 5. To actually get audio track, user permission is always necessary;
|
| // 6. To actually get audio track, getUserMedia() should set audio
|
| // constraint.
|
| + function screenShareWithAudioPermissionGetStream() {
|
| + chrome.desktopCapture.chooseDesktopMedia(
|
| + ["screen", "audio"],
|
| + onPickerResult.bind(undefined,
|
| + expected_audio_tracks_for_screen_share));
|
| + },
|
| +
|
| + function screenShareWithoutAudioPermissionGetStream() {
|
| + chrome.desktopCapture.chooseDesktopMedia(
|
| + ["screen", "audio"], onPickerResult.bind(undefined, 0));
|
| + }
|
| +
|
| + /**
|
| + * Only screenShare can be tested as above, because "chooseDesktopMedia" will
|
| + * return fake source id to tab/windowShare, with which tab/window catpure
|
| + * can't be started successfully.
|
| + * TODO(braveyao): get below cases working again. http://crbug.com/699201
|
| function tabShareWithAudioPermissionGetStream() {
|
| chrome.desktopCapture.chooseDesktopMedia(
|
| ["tab", "audio"], onPickerResult.bind(undefined, 1));
|
| @@ -144,13 +161,6 @@ chrome.test.runTests([
|
| ["window", "audio"], onPickerResult.bind(undefined, 0));
|
| },
|
|
|
| - function screenShareWithAudioPermissionGetStream() {
|
| - chrome.desktopCapture.chooseDesktopMedia(
|
| - ["screen", "audio"],
|
| - onPickerResult.bind(undefined,
|
| - expected_audio_tracks_for_screen_share));
|
| - },
|
| -
|
| function tabShareWithoutAudioPermissionGetStream() {
|
| chrome.desktopCapture.chooseDesktopMedia(
|
| ["tab", "audio"], onPickerResult.bind(undefined, 0));
|
| @@ -159,10 +169,7 @@ chrome.test.runTests([
|
| function windowShareWithoutAudioPermissionGetStream() {
|
| chrome.desktopCapture.chooseDesktopMedia(
|
| ["window", "audio"], onPickerResult.bind(undefined, 0));
|
| - },
|
| -
|
| - function screenShareWithoutAudioPermissionGetStream() {
|
| - chrome.desktopCapture.chooseDesktopMedia(
|
| - ["screen", "audio"], onPickerResult.bind(undefined, 0));
|
| }
|
| + **/
|
| +
|
| ]);
|
|
|