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

Side by Side Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 630143002: Revert of Re-enabling fixed WebRTC getusermedia tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/debug/trace_event_impl.h" 6 #include "base/debug/trace_event_impl.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/test/trace_event_analyzer.h" 9 #include "base/test/trace_event_analyzer.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 291 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
292 292
293 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); 293 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
294 NavigateToURL(shell(), url); 294 NavigateToURL(shell(), url);
295 295
296 ExecuteJavascriptAndWaitForOk( 296 ExecuteJavascriptAndWaitForOk(
297 base::StringPrintf("%s({video: true});", 297 base::StringPrintf("%s({video: true});",
298 kRenderDuplicatedMediastreamAndStop)); 298 kRenderDuplicatedMediastreamAndStop));
299 } 299 }
300 300
301 // Flaky on Android. http://crbug.com/387895
302 #if defined(OS_ANDROID)
303 #define MAYBE_GetAudioAndVideoStreamAndStop DISABLED_GetAudioAndVideoStreamAndSt op
304 #else
305 #define MAYBE_GetAudioAndVideoStreamAndStop GetAudioAndVideoStreamAndStop
306 #endif
307
301 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, 308 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
302 GetAudioAndVideoStreamAndStop) { 309 MAYBE_GetAudioAndVideoStreamAndStop) {
303 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 310 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
304 311
305 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); 312 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
306 NavigateToURL(shell(), url); 313 NavigateToURL(shell(), url);
307 314
308 ExecuteJavascriptAndWaitForOk(base::StringPrintf( 315 ExecuteJavascriptAndWaitForOk(base::StringPrintf(
309 "%s({video: true, audio: true});", kGetUserMediaAndStop)); 316 "%s({video: true, audio: true});", kGetUserMediaAndStop));
310 } 317 }
311 318
312 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, 319 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) { 432 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
426 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 433 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
427 434
428 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); 435 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
429 NavigateToURL(shell(), url); 436 NavigateToURL(shell(), url);
430 437
431 ExecuteJavascriptAndWaitForOk( 438 ExecuteJavascriptAndWaitForOk(
432 "twoGetUserMediaAndStop({video: true, audio: true});"); 439 "twoGetUserMediaAndStop({video: true, audio: true});");
433 } 440 }
434 441
442 #if defined(OS_WIN) && !defined(NDEBUG)
443 // Flaky on Webkit Win7 Debug bot: http://crbug.com/417756
444 #define MAYBE_TwoGetUserMediaWithEqualConstraints \
445 DISABLED_TwoGetUserMediaWithEqualConstraints
446 #else
447 #define MAYBE_TwoGetUserMediaWithEqualConstraints \
448 TwoGetUserMediaWithEqualConstraints
449 #endif
435 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, 450 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
436 TwoGetUserMediaWithEqualConstraints) { 451 MAYBE_TwoGetUserMediaWithEqualConstraints) {
437 std::string constraints1 = "{video: true, audio: true}"; 452 std::string constraints1 = "{video: true, audio: true}";
438 const std::string& constraints2 = constraints1; 453 const std::string& constraints2 = constraints1;
439 std::string expected_result = "w=640:h=480-w=640:h=480"; 454 std::string expected_result = "w=640:h=480-w=640:h=480";
440 455
441 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 456 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
442 expected_result); 457 expected_result);
443 } 458 }
444 459
460 #if defined(OS_WIN)
461 // Flaky on Windows Debug: http://crbug.com/417756
462 #define MAYBE_TwoGetUserMediaWithSecondVideoCropped \
463 DISABLED_TwoGetUserMediaWithSecondVideoCropped
464 #else
465 #define MAYBE_TwoGetUserMediaWithSecondVideoCropped \
466 TwoGetUserMediaWithSecondVideoCropped
467 #endif
445 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, 468 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
446 TwoGetUserMediaWithSecondVideoCropped) { 469 MAYBE_TwoGetUserMediaWithSecondVideoCropped) {
447 std::string constraints1 = "{video: true}"; 470 std::string constraints1 = "{video: true}";
448 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; 471 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}";
449 std::string expected_result = "w=640:h=480-w=640:h=360"; 472 std::string expected_result = "w=640:h=480-w=640:h=360";
450 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 473 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
451 expected_result); 474 expected_result);
452 } 475 }
453 476
477 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(NDEBUG))
478 // Flaky on Windows and on Linux Debug: http://crbug.com/417756
479 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
480 DISABLED_TwoGetUserMediaWithFirstHdSecondVga
481 #else
482 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \
483 TwoGetUserMediaWithFirstHdSecondVga
484 #endif
454 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, 485 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
455 TwoGetUserMediaWithFirstHdSecondVga) { 486 MAYBE_TwoGetUserMediaWithFirstHdSecondVga) {
456 std::string constraints1 = 487 std::string constraints1 =
457 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; 488 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
458 std::string constraints2 = 489 std::string constraints2 =
459 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}"; 490 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
460 std::string expected_result = "w=1280:h=720-w=640:h=480"; 491 std::string expected_result = "w=1280:h=720-w=640:h=480";
461 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 492 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
462 expected_result); 493 expected_result);
463 } 494 }
464 495
465 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, 496 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 {640, 640, 360, 360, 10, 30}, 638 {640, 640, 360, 360, 10, 30},
608 {640, 640, 480, 480, 10, 30}, 639 {640, 640, 480, 480, 10, 30},
609 {960, 960, 720, 720, 10, 30}, 640 {960, 960, 720, 720, 10, 30},
610 {1280, 1280, 720, 720, 10, 30}}; 641 {1280, 1280, 720, 720, 10, 30}};
611 642
612 INSTANTIATE_TEST_CASE_P(UserMedia, 643 INSTANTIATE_TEST_CASE_P(UserMedia,
613 WebRtcConstraintsBrowserTest, 644 WebRtcConstraintsBrowserTest,
614 testing::ValuesIn(kAllUserMediaSizes)); 645 testing::ValuesIn(kAllUserMediaSizes));
615 646
616 } // namespace content 647 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698