Chromium Code Reviews| Index: chrome/browser/media/webrtc_browsertest_base.cc |
| diff --git a/chrome/browser/media/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc_browsertest_base.cc |
| index 378c80d7887f9c605407c735b806e98d967f660e..e68e52dfa98bf80287f17d34001b5909e247849d 100644 |
| --- a/chrome/browser/media/webrtc_browsertest_base.cc |
| +++ b/chrome/browser/media/webrtc_browsertest_base.cc |
| @@ -303,15 +303,21 @@ std::string WebRtcTestBase::ExecuteJavascript( |
| } |
| void WebRtcTestBase::SetupPeerconnectionWithLocalStream( |
| - content::WebContents* tab) const { |
| - SetupPeerconnectionWithoutLocalStream(tab); |
| + content::WebContents* tab, |
| + std::string certificate_keygen_algorithm) const { |
| + SetupPeerconnectionWithoutLocalStream(tab, certificate_keygen_algorithm); |
| EXPECT_EQ("ok-added", ExecuteJavascript("addLocalStream()", tab)); |
| } |
| void WebRtcTestBase::SetupPeerconnectionWithoutLocalStream( |
| - content::WebContents* tab) const { |
| + content::WebContents* tab, |
| + std::string certificate_keygen_algorithm) const { |
| + if (certificate_keygen_algorithm.empty()) |
| + certificate_keygen_algorithm = "null"; |
|
phoglund_chromium
2016/04/26 11:54:20
I would prefer if you made "null" the default inst
hbos_chromium
2016/04/27 11:19:03
Done.
|
| + std::string javascript = base::StringPrintf( |
| + "preparePeerConnection(%s)", certificate_keygen_algorithm.c_str()); |
| EXPECT_EQ("ok-peerconnection-created", |
| - ExecuteJavascript("preparePeerConnection()", tab)); |
| + ExecuteJavascript(javascript, tab)); |
| } |
| std::string WebRtcTestBase::CreateLocalOffer( |