Chromium Code Reviews| Index: chrome/browser/media/webrtc_browsertest.cc |
| diff --git a/chrome/browser/media/webrtc_browsertest.cc b/chrome/browser/media/webrtc_browsertest.cc |
| index 5a22b015a884c93a57256bdab3bd78f6460344bb..af81585be4b013f3a352cbd2368f63b45e5a4319 100644 |
| --- a/chrome/browser/media/webrtc_browsertest.cc |
| +++ b/chrome/browser/media/webrtc_browsertest.cc |
| @@ -43,7 +43,9 @@ class WebRtcBrowserTest : public WebRtcTestBase { |
| command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc"); |
| } |
| - void RunsAudioVideoWebRTCCallInTwoTabs(std::string video_codec) { |
| + void RunsAudioVideoWebRTCCallInTwoTabs( |
| + std::string certificate_keygen_algorithm, |
| + std::string video_codec) { |
| if (OnWinXp()) return; |
| ASSERT_TRUE(embedded_test_server()->Start()); |
| @@ -53,8 +55,8 @@ class WebRtcBrowserTest : public WebRtcTestBase { |
| content::WebContents* right_tab = |
| OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); |
| - SetupPeerconnectionWithLocalStream(left_tab); |
| - SetupPeerconnectionWithLocalStream(right_tab); |
| + SetupPeerconnectionWithLocalStream(left_tab, certificate_keygen_algorithm); |
| + SetupPeerconnectionWithLocalStream(right_tab, certificate_keygen_algorithm); |
| NegotiateCall(left_tab, right_tab, video_codec); |
| @@ -73,13 +75,32 @@ class WebRtcBrowserTest : public WebRtcTestBase { |
| }; |
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| + RunsAudioVideoWebRTCCallInTwoTabsRSACertificate) { |
| + // RSA certificate, default video codec. |
| + RunsAudioVideoWebRTCCallInTwoTabs( |
| + "{ name: \"RSASSA-PKCS1-v1_5\", modulusLength: 2048, publicExponent: " |
| + "new Uint8Array([1, 0, 1]), hash: \"SHA-256\" }", |
| + ""); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| + RunsAudioVideoWebRTCCallInTwoTabsECDSACertificate) { |
| + // ECDSA certificate, default video codec. |
| + RunsAudioVideoWebRTCCallInTwoTabs( |
| + "{ name: \"ECDSA\", namedCurve: \"P-256\" }", |
| + ""); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| RunsAudioVideoWebRTCCallInTwoTabsVP8) { |
| - RunsAudioVideoWebRTCCallInTwoTabs("VP8"); |
| + // Default certificate, VP8 video codec. |
| + RunsAudioVideoWebRTCCallInTwoTabs("", "VP8"); |
| } |
| IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| RunsAudioVideoWebRTCCallInTwoTabsVP9) { |
| - RunsAudioVideoWebRTCCallInTwoTabs("VP9"); |
| + // Default certificate, VP9 video codec. |
| + RunsAudioVideoWebRTCCallInTwoTabs("", "VP9"); |
| } |
| #if BUILDFLAG(RTC_USE_H264) |
| @@ -93,7 +114,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| "(test \"OK\")"; |
| return; |
| } |
| - RunsAudioVideoWebRTCCallInTwoTabs("H264"); |
| + // Default certificate, H264 video codec. |
|
hbos_chromium
2016/04/26 10:03:05
(oops extra spaces, will remove before landing)
|
| + RunsAudioVideoWebRTCCallInTwoTabs("", "H264"); |
| } |
| #endif // BUILDFLAG(RTC_USE_H264) |