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

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

Issue 120773003: Ported media stream track enable-disable test to content module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
OLDNEW
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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { 451 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
452 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 452 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
453 453
454 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 454 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
455 NavigateToURL(shell(), url); 455 NavigateToURL(shell(), url);
456 456
457 EXPECT_TRUE( 457 EXPECT_TRUE(
458 ExecuteJavascript("callAndSendDtmf('123,abc');")); 458 ExecuteJavascript("callAndSendDtmf('123,abc');"));
459 } 459 }
460 460
461 // TODO(phoglund): this test fails because the peer connection state will be
462 // stable in the second negotiation round rather than have-local-offer.
perkj_chrome 2014/01/07 06:51:26 Can you show me? Is the test wrong or an actual pc
phoglund_chromium 2014/01/07 14:41:59 I'm not sure. So what happens is that when we call
461 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, 463 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
462 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { 464 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
463 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 465 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
464 466
465 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 467 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
466 NavigateToURL(shell(), url); 468 NavigateToURL(shell(), url);
467 469
468 const char* kJavascript = 470 const char* kJavascript =
469 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; 471 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});";
470 EXPECT_TRUE(ExecuteJavascript(kJavascript)); 472 EXPECT_TRUE(ExecuteJavascript(kJavascript));
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 811
810 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 812 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
811 NavigateToURL(shell(), url); 813 NavigateToURL(shell(), url);
812 814
813 EXPECT_TRUE(ExecuteJavascript( 815 EXPECT_TRUE(ExecuteJavascript(
814 base::StringPrintf("callAndEnsureAudioMutingWorks(%s);", 816 base::StringPrintf("callAndEnsureAudioMutingWorks(%s);",
815 kForceIsac16K))); 817 kForceIsac16K)));
816 ExpectTitle("OK"); 818 ExpectTitle("OK");
817 } 819 }
818 820
821 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallAndVerifyVideoMutingWorks) {
822 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
823
824 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
825 NavigateToURL(shell(), url);
826
827 EXPECT_TRUE(ExecuteJavascript("callAndEnsureVideoMutingWorks();"));
828 ExpectTitle("OK");
829 }
830
819 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(AR CH_CPU_ARM_FAMILY)) 831 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(AR CH_CPU_ARM_FAMILY))
820 // Timing out on ARM linux bot: http://crbug.com/238490 832 // Timing out on ARM linux bot: http://crbug.com/238490
821 // Failing on Windows: http://crbug.com/331035 833 // Failing on Windows: http://crbug.com/331035
822 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump 834 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump
823 #else 835 #else
824 #define MAYBE_CallWithAecDump CallWithAecDump 836 #define MAYBE_CallWithAecDump CallWithAecDump
825 #endif 837 #endif
826 838
827 // This tests will make a complete PeerConnection-based call, verify that 839 // This tests will make a complete PeerConnection-based call, verify that
828 // video is playing for the call, and verify that a non-empty AEC dump file 840 // 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
891 EXPECT_TRUE(base::PathExists(dump_file)); 903 EXPECT_TRUE(base::PathExists(dump_file));
892 int64 file_size = 0; 904 int64 file_size = 0;
893 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); 905 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
894 EXPECT_EQ(0, file_size); 906 EXPECT_EQ(0, file_size);
895 907
896 base::DeleteFile(dump_file, false); 908 base::DeleteFile(dump_file, false);
897 } 909 }
898 910
899 911
900 } // namespace content 912 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698