| 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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 450 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| 451 MAYBE_TwoGetUserMediaWithEqualConstraints) { | 451 MAYBE_TwoGetUserMediaWithEqualConstraints) { |
| 452 std::string constraints1 = "{video: true, audio: true}"; | 452 std::string constraints1 = "{video: true, audio: true}"; |
| 453 const std::string& constraints2 = constraints1; | 453 const std::string& constraints2 = constraints1; |
| 454 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"; |
| 455 | 455 |
| 456 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, | 456 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, |
| 457 expected_result); | 457 expected_result); |
| 458 } | 458 } |
| 459 | 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 |
| 460 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 468 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
| 461 TwoGetUserMediaWithSecondVideoCropped) { | 469 MAYBE_TwoGetUserMediaWithSecondVideoCropped) { |
| 462 std::string constraints1 = "{video: true}"; | 470 std::string constraints1 = "{video: true}"; |
| 463 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; | 471 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; |
| 464 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"; |
| 465 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, | 473 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, |
| 466 expected_result); | 474 expected_result); |
| 467 } | 475 } |
| 468 | 476 |
| 469 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(NDEBUG)) | 477 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(NDEBUG)) |
| 470 // Flaky on Windows and on Linux Debug: http://crbug.com/417756 | 478 // Flaky on Windows and on Linux Debug: http://crbug.com/417756 |
| 471 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ | 479 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 {640, 640, 360, 360, 10, 30}, | 638 {640, 640, 360, 360, 10, 30}, |
| 631 {640, 640, 480, 480, 10, 30}, | 639 {640, 640, 480, 480, 10, 30}, |
| 632 {960, 960, 720, 720, 10, 30}, | 640 {960, 960, 720, 720, 10, 30}, |
| 633 {1280, 1280, 720, 720, 10, 30}}; | 641 {1280, 1280, 720, 720, 10, 30}}; |
| 634 | 642 |
| 635 INSTANTIATE_TEST_CASE_P(UserMedia, | 643 INSTANTIATE_TEST_CASE_P(UserMedia, |
| 636 WebRtcConstraintsBrowserTest, | 644 WebRtcConstraintsBrowserTest, |
| 637 testing::ValuesIn(kAllUserMediaSizes)); | 645 testing::ValuesIn(kAllUserMediaSizes)); |
| 638 | 646 |
| 639 } // namespace content | 647 } // namespace content |
| OLD | NEW |