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 925ae4a69cfee40e2c37136b94be4f50cc72371c..2e0b0f8aa904672e14cade38acd467e1743b5215 100644 |
--- a/chrome/browser/media/chrome_webrtc_browsertest.cc |
+++ b/chrome/browser/media/chrome_webrtc_browsertest.cc |
@@ -40,35 +40,44 @@ class WebRtcBrowserTest : public WebRtcTestBase { |
// Flag used by TestWebAudioMediaStream to force garbage collection. |
command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); |
} |
-}; |
-IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
- RunsAudioVideoWebRTCCallInTwoTabs) { |
- if (OnWinXp()) return; |
+ void RunsAudioVideoWebRTCCallInTwoTabs(std::string video_codec) { |
+ if (OnWinXp()) return; |
- ASSERT_TRUE(embedded_test_server()->Start()); |
+ ASSERT_TRUE(embedded_test_server()->Start()); |
- content::WebContents* left_tab = |
- OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
- content::WebContents* right_tab = |
- OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
+ content::WebContents* left_tab = |
+ OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
+ content::WebContents* right_tab = |
+ OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
- SetupPeerconnectionWithLocalStream(left_tab); |
- SetupPeerconnectionWithLocalStream(right_tab); |
+ SetupPeerconnectionWithLocalStream(left_tab); |
+ SetupPeerconnectionWithLocalStream(right_tab); |
- NegotiateCall(left_tab, right_tab); |
+ NegotiateCall(left_tab, right_tab, video_codec); |
- StartDetectingVideo(left_tab, "remote-view"); |
- StartDetectingVideo(right_tab, "remote-view"); |
+ StartDetectingVideo(left_tab, "remote-view"); |
+ StartDetectingVideo(right_tab, "remote-view"); |
#if !defined(OS_MACOSX) |
- // Video is choppy on Mac OS X. http://crbug.com/443542. |
- WaitForVideoToPlay(left_tab); |
- WaitForVideoToPlay(right_tab); |
+ // Video is choppy on Mac OS X. http://crbug.com/443542. |
+ WaitForVideoToPlay(left_tab); |
+ WaitForVideoToPlay(right_tab); |
#endif |
- HangUp(left_tab); |
- HangUp(right_tab); |
+ HangUp(left_tab); |
+ HangUp(right_tab); |
+ } |
+}; |
+ |
+IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
+ RunsAudioVideoWebRTCCallInTwoTabsVP8) { |
+ RunsAudioVideoWebRTCCallInTwoTabs("VP8"); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
+ RunsAudioVideoWebRTCCallInTwoTabsVP9) { |
+ RunsAudioVideoWebRTCCallInTwoTabs("VP9"); |
} |
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) { |