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

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

Issue 345713005: Make sure MediaStreamManager handles requests in order. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comment. Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | 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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 } 445 }
446 446
447 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 447 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
448 TwoGetUserMediaWithEqualConstraints) { 448 TwoGetUserMediaWithEqualConstraints) {
449 std::string constraints1 = "{video: true, audio: true}"; 449 std::string constraints1 = "{video: true, audio: true}";
450 const std::string& constraints2 = constraints1; 450 const std::string& constraints2 = constraints1;
451 std::string expected_result = "w=640:h=480-w=640:h=480"; 451 std::string expected_result = "w=640:h=480-w=640:h=480";
452 452
453 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 453 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
454 expected_result); 454 expected_result);
455 } 455 }
456 456
457 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 457 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
458 TwoGetUserMediaWithSecondVideoCropped) { 458 TwoGetUserMediaWithSecondVideoCropped) {
459 std::string constraints1 = "{video: true}"; 459 std::string constraints1 = "{video: true}";
460 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}"; 460 std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}";
461 std::string expected_result = "w=640:h=480-w=640:h=360"; 461 std::string expected_result = "w=640:h=480-w=640:h=360";
462 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 462 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
463 expected_result); 463 expected_result);
464 } 464 }
465 465
466 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 466 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
467 DISABLED_TwoGetUserMediaWithFirstHdSecondVga) { 467 TwoGetUserMediaWithFirstHdSecondVga) {
468 std::string constraints1 = 468 std::string constraints1 =
469 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}"; 469 "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
470 std::string constraints2 = 470 std::string constraints2 =
471 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}"; 471 "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
472 std::string expected_result = "w=1280:h=720-w=640:h=480"; 472 std::string expected_result = "w=1280:h=720-w=640:h=480";
473 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2, 473 RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
474 expected_result); 474 expected_result);
475 } 475 }
476 476
477 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, 477 IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 {640, 640, 360, 360, 10, 30}, 600 {640, 640, 360, 360, 10, 30},
601 {640, 640, 480, 480, 10, 30}, 601 {640, 640, 480, 480, 10, 30},
602 {960, 960, 720, 720, 10, 30}, 602 {960, 960, 720, 720, 10, 30},
603 {1280, 1280, 720, 720, 10, 30}}; 603 {1280, 1280, 720, 720, 10, 30}};
604 604
605 INSTANTIATE_TEST_CASE_P(UserMedia, 605 INSTANTIATE_TEST_CASE_P(UserMedia,
606 WebRtcConstraintsBrowserTest, 606 WebRtcConstraintsBrowserTest,
607 testing::ValuesIn(kAllUserMediaSizes)); 607 testing::ValuesIn(kAllUserMediaSizes));
608 608
609 } // namespace content 609 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698