Chromium Code Reviews| 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 b12840703a67a48eaea4fed7e957254685d9dbed..d1f8f1df2bf2f2f240da1962a7284b71a50c8f64 100644 |
| --- a/content/browser/media/webrtc_getusermedia_browsertest.cc |
| +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc |
| @@ -377,21 +377,33 @@ IN_PROC_BROWSER_TEST_F( |
| // This test calls getUserMedia and checks for aspect ratio behavior. |
| IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| - TestGetUserMediaAspectRatio) { |
| + TestGetUserMediaAspectRatio4To3) { |
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
| std::string constraints_4_3 = GenerateGetUserMediaCall( |
| kGetUserMediaAndAnalyseAndStop, 640, 640, 480, 480, 30, 30); |
| - std::string constraints_16_9 = GenerateGetUserMediaCall( |
| - kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 30, 30); |
| // TODO(mcasas): add more aspect ratios, in particular 16:10 crbug.com/275594. |
| NavigateToURL(shell(), url); |
| ASSERT_TRUE(ExecuteJavascript(constraints_4_3)); |
| ExpectTitle("4:3 letterbox"); |
| +} |
| + |
| +// This test calls getUserMedia and checks for aspect ratio behavior. |
| +// TODO(perkj): Enable this test as soon as crbug/349450 is fixed. |
| +// Currently the render pipeline don't support cropping where the new cropped |
|
tommi (sloooow) - chröme
2014/03/06 10:14:09
don't -> doesn't
perkj_chrome
2014/03/06 12:45:42
Done.
|
| +// frame don't have the same top left pixel as the original frame. |
|
tommi (sloooow) - chröme
2014/03/06 10:14:09
don't -> doesn't
nit: pixel -> coordinates
perkj_chrome
2014/03/06 12:45:42
Done.
tommi (sloooow) - chröme
2014/03/06 13:28:50
missed fixing the "don't vs doesn't typo" :)
perkj_chrome
2014/03/06 14:22:53
Sorry about that. Strange that I do the same gramm
|
| +IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| + DISABLED_TestGetUserMediaAspectRatio16To9) { |
| + ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| + |
| + GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); |
| + |
| + std::string constraints_16_9 = GenerateGetUserMediaCall( |
| + kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 30, 30); |
| NavigateToURL(shell(), url); |
| ASSERT_TRUE(ExecuteJavascript(constraints_16_9)); |