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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 | 459 |
460 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 460 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
461 TwoGetUserMediaWithSecondVideoCropped) { | 461 TwoGetUserMediaWithSecondVideoCropped) { |
462 std::string constraints1 = "{video: true}"; | 462 std::string constraints1 = "{video: true}"; |
463 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; | 463 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; |
464 std::string expected_result = "w=640:h=480-w=640:h=360"; | 464 std::string expected_result = "w=640:h=480-w=640:h=360"; |
465 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, | 465 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, |
466 expected_result); | 466 expected_result); |
467 } | 467 } |
468 | 468 |
469 #if defined(OS_WIN) && !defined(NDEBUG) | 469 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(NDEBUG)) |
470 // Flaky on Webkit Win7 Debug bot: http://crbug.com/417756 | 470 // Flaky on Windows and on Linux Debug: http://crbug.com/417756 |
471 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ | 471 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
472 DISABLED_TwoGetUserMediaWithFirstHdSecondVga | 472 DISABLED_TwoGetUserMediaWithFirstHdSecondVga |
473 #else | 473 #else |
474 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ | 474 #define MAYBE_TwoGetUserMediaWithFirstHdSecondVga \ |
475 TwoGetUserMediaWithFirstHdSecondVga | 475 TwoGetUserMediaWithFirstHdSecondVga |
476 #endif | 476 #endif |
477 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, | 477 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, |
478 MAYBE_TwoGetUserMediaWithFirstHdSecondVga) { | 478 MAYBE_TwoGetUserMediaWithFirstHdSecondVga) { |
479 std::string constraints1 = | 479 std::string constraints1 = |
480 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; | 480 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 {640, 640, 360, 360, 10, 30}, | 630 {640, 640, 360, 360, 10, 30}, |
631 {640, 640, 480, 480, 10, 30}, | 631 {640, 640, 480, 480, 10, 30}, |
632 {960, 960, 720, 720, 10, 30}, | 632 {960, 960, 720, 720, 10, 30}, |
633 {1280, 1280, 720, 720, 10, 30}}; | 633 {1280, 1280, 720, 720, 10, 30}}; |
634 | 634 |
635 INSTANTIATE_TEST_CASE_P(UserMedia, | 635 INSTANTIATE_TEST_CASE_P(UserMedia, |
636 WebRtcConstraintsBrowserTest, | 636 WebRtcConstraintsBrowserTest, |
637 testing::ValuesIn(kAllUserMediaSizes)); | 637 testing::ValuesIn(kAllUserMediaSizes)); |
638 | 638 |
639 } // namespace content | 639 } // namespace content |
OLD | NEW |