Index: content/browser/media/webrtc_aecdump_browsertest.cc |
diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc |
index 8dc3e0e2f2f17fee583fb4e0b08caebc75ee1ea5..2be1f110f6d82249521c7604d7c547a34d4594f6 100644 |
--- a/content/browser/media/webrtc_aecdump_browsertest.cc |
+++ b/content/browser/media/webrtc_aecdump_browsertest.cc |
@@ -20,9 +20,11 @@ namespace content { |
// This tests AEC dump enabled using the command line flag. It does not test AEC |
// dump enabled using webrtc-internals (that's tested in webrtc_browsertest.cc). |
-class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest { |
+class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest, |
+ public testing::WithParamInterface<bool> { |
public: |
- WebRtcAecDumpBrowserTest() {} |
+ WebRtcAecDumpBrowserTest() : enable_audio_track_processing_(GetParam()) { |
+ } |
virtual ~WebRtcAecDumpBrowserTest() {} |
virtual void SetUp() OVERRIDE { |
@@ -40,6 +42,10 @@ class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest { |
// Enable AEC dump with the command line flag. |
command_line->AppendSwitchPath(switches::kEnableWebRtcAecRecordings, |
dump_file_); |
+ |
+ if (enable_audio_track_processing_) { |
+ command_line->AppendSwitch(switches::kEnableAudioTrackProcessing); |
+ } |
} |
protected: |
@@ -47,9 +53,15 @@ class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest { |
base::FilePath dump_file_; |
private: |
+ bool enable_audio_track_processing_; |
DISALLOW_COPY_AND_ASSIGN(WebRtcAecDumpBrowserTest); |
}; |
+static const bool kRunTestsWithFlag[] = { false, true }; |
+INSTANTIATE_TEST_CASE_P(WebRtcAecDumpBrowserTests, |
+ WebRtcAecDumpBrowserTest, |
+ testing::ValuesIn(kRunTestsWithFlag)); |
+ |
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
// Timing out on ARM linux bot: http://crbug.com/238490 |
#define MAYBE_CallWithAecDump DISABLED_CallWithAecDump |
@@ -60,7 +72,7 @@ class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest { |
// This tests will make a complete PeerConnection-based call, verify that |
// video is playing for the call, and verify that a non-empty AEC dump file |
// exists. |
-IN_PROC_BROWSER_TEST_F(WebRtcAecDumpBrowserTest, MAYBE_CallWithAecDump) { |
+IN_PROC_BROWSER_TEST_P(WebRtcAecDumpBrowserTest, MAYBE_CallWithAecDump) { |
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |