| OLD | NEW |
| 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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 | 451 |
| 452 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 452 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| 453 TwoGetUserMediaWithSecondVideoCropped) { | 453 TwoGetUserMediaWithSecondVideoCropped) { |
| 454 std::string constraints1 = "{video: true}"; | 454 std::string constraints1 = "{video: true}"; |
| 455 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; | 455 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; |
| 456 std::string expected_result = "w=640:h=480-w=640:h=360"; | 456 std::string expected_result = "w=640:h=480-w=640:h=360"; |
| 457 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, | 457 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, |
| 458 expected_result); | 458 expected_result); |
| 459 } | 459 } |
| 460 | 460 |
| 461 #if defined(OS_WIN) && !defined(NDEBUG) |
| 462 // Flaky on Webkit Win7 Debug bot: http://crbug.com/417756 |
| 463 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
| 464 DISABLED_TwoGetUserMediaWithFirstHdSecondVga |
| 465 #else |
| 466 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
| 467 TwoGetUserMediaWithFirstHdSecondVga |
| 468 #endif |
| 469 |
| 461 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 470 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| 462 TwoGetUserMediaWithFirstHdSecondVga) { | 471 MAYBE_TwoGetUserMediaWithFirstHdSecondVga) { |
| 463 std::string constraints1 = | 472 std::string constraints1 = |
| 464 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; | 473 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; |
| 465 std::string constraints2 = | 474 std::string constraints2 = |
| 466 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}"; | 475 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}"; |
| 467 std::string expected_result = "w=1280:h=720-w=640:h=480"; | 476 std::string expected_result = "w=1280:h=720-w=640:h=480"; |
| 468 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, | 477 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, |
| 469 expected_result); | 478 expected_result); |
| 470 } | 479 } |
| 471 | 480 |
| 472 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 481 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 {640, 640, 360, 360, 10, 30}, | 623 {640, 640, 360, 360, 10, 30}, |
| 615 {640, 640, 480, 480, 10, 30}, | 624 {640, 640, 480, 480, 10, 30}, |
| 616 {960, 960, 720, 720, 10, 30}, | 625 {960, 960, 720, 720, 10, 30}, |
| 617 {1280, 1280, 720, 720, 10, 30}}; | 626 {1280, 1280, 720, 720, 10, 30}}; |
| 618 | 627 |
| 619 INSTANTIATE_TEST_CASE_P(UserMedia, | 628 INSTANTIATE_TEST_CASE_P(UserMedia, |
| 620 WebRtcConstraintsBrowserTest, | 629 WebRtcConstraintsBrowserTest, |
| 621 testing::ValuesIn(kAllUserMediaSizes)); | 630 testing::ValuesIn(kAllUserMediaSizes)); |
| 622 | 631 |
| 623 } // namespace content | 632 } // namespace content |
| OLD | NEW |