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..d9446fd94c5dfdb808e65ab3a7b8ff607835be1c 100644 |
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc |
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc |
@@ -333,6 +333,30 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
video_ids[0]))); |
} |
+// Test that opening an unsupported resolution ends up in an error. |
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
+ GetVideoStreamWithUnsupportedVideoSize) { |
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
perkj_chrome
2014/03/12 19:55:48
Oh, I did this in https://codereview.chromium.org/
mcasas
2014/03/13 08:04:56
I'll remove these two tests then, but I'd recommen
|
+ GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
+ NavigateToURL(shell(), url); |
+ |
+ std::string too_large_constraints = GenerateGetUserMediaCall( |
+ kGetUserMediaAndStop, 800, 800, 600, 600, 20, 20); |
+ DCHECK_NE(kOK, ExecuteJavascriptAndReturnResult(too_large_constraints)); |
+} |
+ |
+// Test that opening an unsupported frame rate ends up in an error. |
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
+ GetVideoStreamWithUnsupportedFrameRate) { |
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
perkj_chrome
2014/03/12 19:55:48
Do we need a special test for this? I think this i
mcasas
2014/03/13 08:04:56
See above.
|
+ GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
+ NavigateToURL(shell(), url); |
+ |
+ std::string too_fast_constraints = GenerateGetUserMediaCall( |
+ kGetUserMediaAndStop, 640, 640, 480, 480, 30, 30); |
+ DCHECK_NE(kOK, ExecuteJavascriptAndReturnResult(too_fast_constraints)); |
+} |
+ |
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) { |
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
@@ -364,7 +388,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
std::string constraints_4_3 = GenerateGetUserMediaCall( |
- kGetUserMediaAndAnalyseAndStop, 640, 640, 480, 480, 30, 30); |
+ kGetUserMediaAndAnalyseAndStop, 640, 640, 480, 480, 20, 20); |
perkj_chrome
2014/03/12 19:55:48
Can we skip changing the maxFramerate and only cha
mcasas
2014/03/13 08:04:56
Done.
|
// TODO(mcasas): add more aspect ratios, in particular 16:10 crbug.com/275594. |
@@ -384,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
std::string constraints_16_9 = GenerateGetUserMediaCall( |
- kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 30, 30); |
+ kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 20, 20); |
NavigateToURL(shell(), url); |
ASSERT_EQ("16:9 letterbox", |
@@ -434,13 +458,13 @@ IN_PROC_BROWSER_TEST_P(WebRtcConstraintsBrowserTest, GetUserMediaConstraints) { |
} |
static const UserMediaSizes kAllUserMediaSizes[] = { |
- {320, 320, 180, 180, 30, 30}, |
- {320, 320, 240, 240, 30, 30}, |
- {640, 640, 360, 360, 30, 30}, |
- {640, 640, 480, 480, 30, 30}, |
- {960, 960, 720, 720, 30, 30}, |
- {1280, 1280, 720, 720, 30, 30}, |
- {1920, 1920, 1080, 1080, 30, 30}}; |
+ {320, 320, 180, 180, 20, 20}, |
+ {320, 320, 240, 240, 20, 20}, |
+ {640, 640, 360, 360, 20, 20}, |
+ {640, 640, 480, 480, 20, 20}, |
+ {960, 960, 720, 720, 20, 20}, |
+ {1280, 1280, 720, 720, 20, 20}, |
+ {1920, 1920, 1080, 1080, 20, 20}}; |
INSTANTIATE_TEST_CASE_P(UserMedia, |
WebRtcConstraintsBrowserTest, |