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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall | 443 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall |
444 #else | 444 #else |
445 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall | 445 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall |
446 #endif | 446 #endif |
447 | 447 |
448 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { | 448 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { |
449 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); | 449 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); |
450 } | 450 } |
451 | 451 |
452 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { | 452 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { |
453 // Don't force iSAC on Android for this test: iSAC doesn't work with DTMF. | 453 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); |
454 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | |
455 | |
456 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | |
457 NavigateToURL(shell(), url); | |
458 | |
459 ASSERT_TRUE(ExecuteJavascript("callAndSendDtmf(\'123,abc\');")); | |
460 ExpectTitle("OK"); | |
461 } | 454 } |
462 | 455 |
463 // TODO(phoglund): this test fails because the peer connection state will be | 456 // TODO(phoglund): this test fails because the peer connection state will be |
464 // stable in the second negotiation round rather than have-local-offer. | 457 // stable in the second negotiation round rather than have-local-offer. |
465 // http://crbug.com/293125. | 458 // http://crbug.com/293125. |
466 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, | 459 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, |
467 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { | 460 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { |
468 const char* kJavascript = | 461 const char* kJavascript = |
469 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; | 462 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; |
470 MakeTypicalPeerConnectionCall(kJavascript); | 463 MakeTypicalPeerConnectionCall(kJavascript); |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
796 EXPECT_TRUE(base::PathExists(dump_file)); | 789 EXPECT_TRUE(base::PathExists(dump_file)); |
797 int64 file_size = 0; | 790 int64 file_size = 0; |
798 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); | 791 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); |
799 EXPECT_EQ(0, file_size); | 792 EXPECT_EQ(0, file_size); |
800 | 793 |
801 base::DeleteFile(dump_file, false); | 794 base::DeleteFile(dump_file, false); |
802 } | 795 } |
803 | 796 |
804 | 797 |
805 } // namespace content | 798 } // namespace content |
OLD | NEW |