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

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

Issue 131613005: Fixed video muting test on Android, added logging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('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 (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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 709
710 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch( 710 ASSERT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
711 switches::kUseFakeDeviceForMediaStream)) 711 switches::kUseFakeDeviceForMediaStream))
712 << "Must run with fake devices since the test will explicitly look " 712 << "Must run with fake devices since the test will explicitly look "
713 << "for the fake device signal."; 713 << "for the fake device signal.";
714 714
715 MakeTypicalPeerConnectionCall("callAndEnsureAudioMutingWorks();"); 715 MakeTypicalPeerConnectionCall("callAndEnsureAudioMutingWorks();");
716 } 716 }
717 717
718 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallAndVerifyVideoMutingWorks) { 718 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallAndVerifyVideoMutingWorks) {
719 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 719 MakeTypicalPeerConnectionCall("callAndEnsureVideoMutingWorks();");
720
721 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
722 NavigateToURL(shell(), url);
723
724 EXPECT_TRUE(ExecuteJavascript("callAndEnsureVideoMutingWorks();"));
725 ExpectTitle("OK");
726 } 720 }
727 721
728 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(AR CH_CPU_ARM_FAMILY)) 722 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(AR CH_CPU_ARM_FAMILY))
729 // Timing out on ARM linux bot: http://crbug.com/238490 723 // Timing out on ARM linux bot: http://crbug.com/238490
730 // Failing on Windows: http://crbug.com/331035 724 // Failing on Windows: http://crbug.com/331035
731 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump 725 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump
732 #else 726 #else
733 #define MAYBE_CallWithAecDump CallWithAecDump 727 #define MAYBE_CallWithAecDump CallWithAecDump
734 #endif 728 #endif
735 729
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 EXPECT_TRUE(base::PathExists(dump_file)); 790 EXPECT_TRUE(base::PathExists(dump_file));
797 int64 file_size = 0; 791 int64 file_size = 0;
798 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); 792 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
799 EXPECT_EQ(0, file_size); 793 EXPECT_EQ(0, file_size);
800 794
801 base::DeleteFile(dump_file, false); 795 base::DeleteFile(dump_file, false);
802 } 796 }
803 797
804 798
805 } // namespace content 799 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698