| Index: content/browser/media/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| index 945ab520c8adaa08efb9428e193719148d864a08..ca3d9d1b36a96e608b3e041bdf051907487c47ab 100644
|
| --- a/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
|
| @@ -279,25 +279,25 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
|
|
| // Test with invalid mandatory audio sourceID.
|
| NavigateToURL(shell(), url);
|
| - ExecuteJavascriptAndWaitForOk(
|
| + EXPECT_EQ("PermissionDeniedError", ExecuteJavascriptAndReturnResult(
|
| GenerateGetUserMediaWithMandatorySourceID(
|
| kGetUserMediaAndExpectFailure,
|
| "something invalid",
|
| - video_ids[0]));
|
| + video_ids[0])));
|
|
|
| // Test with invalid mandatory video sourceID.
|
| - ExecuteJavascriptAndWaitForOk(
|
| + EXPECT_EQ("PermissionDeniedError", ExecuteJavascriptAndReturnResult(
|
| GenerateGetUserMediaWithMandatorySourceID(
|
| kGetUserMediaAndExpectFailure,
|
| audio_ids[0],
|
| - "something invalid"));
|
| + "something invalid")));
|
|
|
| // Test with empty mandatory audio sourceID.
|
| - ExecuteJavascriptAndWaitForOk(
|
| + EXPECT_EQ("PermissionDeniedError", ExecuteJavascriptAndReturnResult(
|
| GenerateGetUserMediaWithMandatorySourceID(
|
| kGetUserMediaAndExpectFailure,
|
| "",
|
| - video_ids[0]));
|
| + video_ids[0])));
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| @@ -343,6 +343,26 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
|
| "twoGetUserMediaAndStop({video: true, audio: true});");
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| + GetUserMediaWithTooHighVideoConstraintsValues) {
|
| + ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| +
|
| + GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| +
|
| + int large_value = 99999;
|
| + std::string call = GenerateGetUserMediaCall(kGetUserMediaAndExpectFailure,
|
| + large_value,
|
| + large_value,
|
| + large_value,
|
| + large_value,
|
| + large_value,
|
| + large_value);
|
| + NavigateToURL(shell(), url);
|
| +
|
| + // TODO(perkj): A proper error code should be returned by gUM.
|
| + EXPECT_EQ("PermissionDeniedError", ExecuteJavascriptAndReturnResult(call));
|
| +}
|
| +
|
| // This test will make a simple getUserMedia page, verify that video is playing
|
| // in a simple local <video>, and for a couple of seconds, collect some
|
| // performance traces from VideoCaptureController colorspace conversion and
|
|
|