Chromium Code Reviews| Index: chrome/browser/media/chrome_webrtc_browsertest.cc |
| diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc |
| index 455da608f153dc125a798adfbf88013213df24bc..1c4b5f82a6d9b8d710d9a3f5815ecfd603e2f091 100644 |
| --- a/chrome/browser/media/chrome_webrtc_browsertest.cc |
| +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc |
| @@ -38,8 +38,15 @@ static const char kMainWebrtcTestHtmlPage[] = |
| // Top-level integration test for WebRTC. The test methods here must run |
| // sequentially since they use a server binary on the system (hence they are |
| // tagged as MANUAL). |
| -class WebRtcBrowserTest : public WebRtcTestBase { |
| +class WebRtcBrowserTest : public WebRtcTestBase, |
| + public testing::WithParamInterface<bool> { |
| public: |
| + WebRtcBrowserTest() { |
| + if (GetParam()) { |
| + CommandLine::ForCurrentProcess()->AppendSwitch( |
|
phoglund_chromium
2014/03/12 17:27:18
Same here.
no longer working on chromium
2014/03/12 18:06:08
ditto
|
| + switches::kEnableAudioTrackProcessing); |
| + } |
| + } |
| virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
| PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem(); |
| DetectErrorsInJavaScript(); // Look for errors in our rather complex js. |
| @@ -110,7 +117,12 @@ class WebRtcBrowserTest : public WebRtcTestBase { |
| PeerConnectionServerRunner peerconnection_server_; |
| }; |
| -IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| +static const bool kRunTestsWithFlag[] = { false, true }; |
| +INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests, |
| + WebRtcBrowserTest, |
| + testing::ValuesIn(kRunTestsWithFlag)); |
| + |
| +IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, |
| MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) { |
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| ASSERT_TRUE(peerconnection_server_.Start()); |
| @@ -135,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| ASSERT_TRUE(peerconnection_server_.Stop()); |
| } |
| -IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CpuUsage15Seconds) { |
| +IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MANUAL_CpuUsage15Seconds) { |
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| ASSERT_TRUE(peerconnection_server_.Start()); |
| @@ -186,7 +198,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CpuUsage15Seconds) { |
| } |
| // This is manual for its long execution time. |
| -IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| +IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, |
| MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetrics) { |
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| ASSERT_TRUE(peerconnection_server_.Start()); |
| @@ -236,7 +248,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| ASSERT_TRUE(peerconnection_server_.Stop()); |
| } |
| -IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) { |
| +IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, TestWebAudioMediaStream) { |
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); |
| ui_test_utils::NavigateToURL(browser(), url); |