| Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
|
| index 3d1209869919b8fe2702935e0660a776a2b1b188..24884084dbff0bb309c00116a5612aeb6c4efed8 100644
|
| --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
|
| +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
|
| @@ -206,6 +206,21 @@ IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, MAYBE_ChooseDesktopMedia) {
|
| webrtc::kFullDesktopScreenId)},
|
| // cancelDialog()
|
| {true, true, false, false, content::DesktopMediaID(), true},
|
| +
|
| + // screenShareWithAudioGetStream()
|
| + {true, false, false, true,
|
| + content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
|
| + webrtc::kFullDesktopScreenId, true)},
|
| +
|
| + // screenShareWithoutAudioGetStream()
|
| + {true, false, false, true,
|
| + content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
|
| + webrtc::kFullDesktopScreenId)},
|
| +
|
| + /**
|
| + * Below test cases are commented out because getUserMedia will fail due
|
| + * to the fake source id currently.
|
| + * TODO(braveyao): get these cases working again. http://crbug.com/699201
|
| // tabShareWithAudioGetStream()
|
| {false, false, true, true,
|
| content::DesktopMediaID(content::DesktopMediaID::TYPE_WEB_CONTENTS, 0,
|
| @@ -213,20 +228,13 @@ IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, MAYBE_ChooseDesktopMedia) {
|
| // windowShareWithAudioGetStream()
|
| {false, true, false, true,
|
| content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, 0, true)},
|
| - // screenShareWithAudioGetStream()
|
| - {true, false, false, true,
|
| - content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
|
| - webrtc::kFullDesktopScreenId, true)},
|
| // tabShareWithoutAudioGetStream()
|
| {false, false, true, true,
|
| content::DesktopMediaID(content::DesktopMediaID::TYPE_WEB_CONTENTS, 0)},
|
| // windowShareWithoutAudioGetStream()
|
| {false, true, false, true,
|
| content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, 0)},
|
| - // screenShareWithoutAudioGetStream()
|
| - {true, false, false, true,
|
| - content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN,
|
| - webrtc::kFullDesktopScreenId)},
|
| + **/
|
| };
|
| picker_factory_.SetTestFlags(test_flags, arraysize(test_flags));
|
| ASSERT_TRUE(RunExtensionTest("desktop_capture")) << message_;
|
|
|