Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6094)

Unified Diff: chrome/test/data/webrtc/peerconnection.js

Issue 1917133002: WebRtcBrowserTest tests with RSA and ECDSA certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed if-statement Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webrtc/peerconnection.js
diff --git a/chrome/test/data/webrtc/peerconnection.js b/chrome/test/data/webrtc/peerconnection.js
index adcb475b24d13c485e7ba406899e95ddc362f6eb..50459b7c62caec20e0d48d36ddd066f00d351837 100644
--- a/chrome/test/data/webrtc/peerconnection.js
+++ b/chrome/test/data/webrtc/peerconnection.js
@@ -29,13 +29,33 @@ var gHasSeenCryptoInSdp = 'no-crypto-seen';
/**
* Creates a peer connection. Must be called before most other public functions
* in this file.
+ * @param {Object} keygenAlgorithm An |AlgorithmIdentifier| to be used as
+ * parameter to |RTCPeerConnection.generateCertificate|. The resulting
+ * certificate will be used by the peer connection.
*/
-function preparePeerConnection() {
- if (gPeerConnection != null)
+function preparePeerConnection(keygenAlgorithm = null) {
+ if (gPeerConnection !== null)
throw failTest('creating peer connection, but we already have one.');
- gPeerConnection = createPeerConnection_();
- returnToTest('ok-peerconnection-created');
+ if (keygenAlgorithm === null) {
+ gPeerConnection = createPeerConnection_(null);
+ returnToTest('ok-peerconnection-created');
+ } else {
+ webkitRTCPeerConnection.generateCertificate(keygenAlgorithm).then(
+ function(certificate) {
+ if (gPeerConnection !== null) {
+ throw failTest('peer connection already set during certificate ' +
+ + 'generation.');
+ }
+ gPeerConnection = createPeerConnection_(
+ {iceServers:[], certificates:[certificate]});
+ returnToTest('ok-peerconnection-created');
+ },
+ function() {
+ failTest('Certificate generation failed. keygenAlgorithm: ' +
+ JSON.stringify(keygenAlgorithm));
+ });
+ }
}
/**
@@ -263,9 +283,9 @@ function hasSeenCryptoInSdp() {
// Internals.
/** @private */
-function createPeerConnection_() {
+function createPeerConnection_(rtcConfig) {
try {
- peerConnection = new RTCPeerConnection(null, {});
+ peerConnection = new RTCPeerConnection(rtcConfig, {});
} catch (exception) {
throw failTest('Failed to create peer connection: ' + exception);
}
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698