OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
442 #endif | 442 #endif |
443 | 443 |
444 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { | 444 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { |
445 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); | 445 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); |
446 } | 446 } |
447 | 447 |
448 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { | 448 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { |
449 MakeTypicalPeerConnectionCall("callAndSendDtmf('123,abc');"); | 449 MakeTypicalPeerConnectionCall("callAndSendDtmf('123,abc');"); |
450 } | 450 } |
451 | 451 |
452 // TODO(phoglund): this test fails because the peer connection state will be | |
453 // stable in the second negotiation round rather than have-local-offer. | |
perkj_chrome
2014/01/08 08:55:51
Somewhere it is a bug.
See http://dev.w3.org/2011
| |
452 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, | 454 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, |
453 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { | 455 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { |
454 const char* kJavascript = | 456 const char* kJavascript = |
455 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; | 457 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; |
456 MakeTypicalPeerConnectionCall(kJavascript); | 458 MakeTypicalPeerConnectionCall(kJavascript); |
457 } | 459 } |
458 | 460 |
459 // Below 2 test will make a complete PeerConnection-based call between pc1 and | 461 // Below 2 test will make a complete PeerConnection-based call between pc1 and |
460 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and | 462 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and |
461 // then verify that video is received on pc3 and pc4. | 463 // then verify that video is received on pc3 and pc4. |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
694 } | 696 } |
695 | 697 |
696 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( | 698 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( |
697 switches::kUseFakeDeviceForMediaStream)) | 699 switches::kUseFakeDeviceForMediaStream)) |
698 << "Must run with fake devices since the test will explicitly look " | 700 << "Must run with fake devices since the test will explicitly look " |
699 << "for the fake device signal."; | 701 << "for the fake device signal."; |
700 | 702 |
701 MakeTypicalPeerConnectionCall("callAndEnsureAudioMutingWorks();"); | 703 MakeTypicalPeerConnectionCall("callAndEnsureAudioMutingWorks();"); |
702 } | 704 } |
703 | 705 |
706 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallAndVerifyVideoMutingWorks) { | |
707 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | |
708 | |
709 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | |
710 NavigateToURL(shell(), url); | |
711 | |
712 EXPECT_TRUE(ExecuteJavascript("callAndEnsureVideoMutingWorks();")); | |
713 ExpectTitle("OK"); | |
714 } | |
715 | |
704 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(AR CH_CPU_ARM_FAMILY)) | 716 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(AR CH_CPU_ARM_FAMILY)) |
705 // Timing out on ARM linux bot: http://crbug.com/238490 | 717 // Timing out on ARM linux bot: http://crbug.com/238490 |
706 // Failing on Windows: http://crbug.com/331035 | 718 // Failing on Windows: http://crbug.com/331035 |
707 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump | 719 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump |
708 #else | 720 #else |
709 #define MAYBE_CallWithAecDump CallWithAecDump | 721 #define MAYBE_CallWithAecDump CallWithAecDump |
710 #endif | 722 #endif |
711 | 723 |
712 // This tests will make a complete PeerConnection-based call, verify that | 724 // This tests will make a complete PeerConnection-based call, verify that |
713 // video is playing for the call, and verify that a non-empty AEC dump file | 725 // video is playing for the call, and verify that a non-empty AEC dump file |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
776 EXPECT_TRUE(base::PathExists(dump_file)); | 788 EXPECT_TRUE(base::PathExists(dump_file)); |
777 int64 file_size = 0; | 789 int64 file_size = 0; |
778 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); | 790 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); |
779 EXPECT_EQ(0, file_size); | 791 EXPECT_EQ(0, file_size); |
780 | 792 |
781 base::DeleteFile(dump_file, false); | 793 base::DeleteFile(dump_file, false); |
782 } | 794 } |
783 | 795 |
784 | 796 |
785 } // namespace content | 797 } // namespace content |
OLD | NEW |