Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(463)

Unified Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 197213004: Fix DCHECK error when invalid video constraints are set on gUM. If a video constraint can not be me… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_capturer_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f6699ca36d5f5e80304d2b28ba5f158befb995a9..c562b0151e01a87cb604ad2d387bcfcd4a83cffe 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -295,25 +295,25 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
// Test with invalid mandatory audio sourceID.
NavigateToURL(shell(), url);
- ExecuteJavascriptAndWaitForOk(
+ EXPECT_EQ("DeviceCaptureError", ExecuteJavascriptAndReturnResult(
GenerateGetUserMediaWithMandatorySourceID(
kGetUserMediaAndExpectFailure,
"something invalid",
- video_ids[0]));
+ video_ids[0])));
// Test with invalid mandatory video sourceID.
- ExecuteJavascriptAndWaitForOk(
+ EXPECT_EQ("DeviceCaptureError", ExecuteJavascriptAndReturnResult(
GenerateGetUserMediaWithMandatorySourceID(
kGetUserMediaAndExpectFailure,
audio_ids[0],
- "something invalid"));
+ "something invalid")));
// Test with empty mandatory audio sourceID.
- ExecuteJavascriptAndWaitForOk(
+ EXPECT_EQ("DeviceCaptureError", ExecuteJavascriptAndReturnResult(
GenerateGetUserMediaWithMandatorySourceID(
kGetUserMediaAndExpectFailure,
"",
- video_ids[0]));
+ video_ids[0])));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
@@ -359,6 +359,26 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
"twoGetUserMediaAndStop({video: true, audio: true});");
}
+IN_PROC_BROWSER_TEST_P(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("TrackStartError", 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
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_capturer_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698