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

Unified Diff: talk/app/webrtc/test/peerconnectiontestwrapper.cc

Issue 1151943005: Ability to specify KeyType (RSA, ECDSA) for SSLIdentity generation in libjingle (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressing ASAN, LSAN issues in unittests Created 5 years, 6 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
Index: talk/app/webrtc/test/peerconnectiontestwrapper.cc
diff --git a/talk/app/webrtc/test/peerconnectiontestwrapper.cc b/talk/app/webrtc/test/peerconnectiontestwrapper.cc
index 91d4f508f77b9bbe191079b6cb257069e3bc332d..81d92b37bbcd6a044dcdc0bd55e7d37013c719f2 100644
--- a/talk/app/webrtc/test/peerconnectiontestwrapper.cc
+++ b/talk/app/webrtc/test/peerconnectiontestwrapper.cc
@@ -26,7 +26,7 @@
*/
#include "talk/app/webrtc/fakeportallocatorfactory.h"
-#include "talk/app/webrtc/test/fakedtlsidentityservice.h"
+#include "talk/app/webrtc/test/fakedtlsidentitystore.h"
#include "talk/app/webrtc/test/fakeperiodicvideocapturer.h"
#include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
#include "talk/app/webrtc/test/peerconnectiontestwrapper.h"
@@ -93,11 +93,12 @@ bool PeerConnectionTestWrapper::CreatePc(
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = "stun:stun.l.google.com:19302";
ice_servers.push_back(ice_server);
- FakeIdentityService* dtls_service =
+ dtls_identity_store_.reset(
rtc::SSLStreamAdapter::HaveDtlsSrtp() ?
- new FakeIdentityService() : NULL;
+ new FakeDtlsIdentityStoreRSA() : nullptr);
peer_connection_ = peer_connection_factory_->CreatePeerConnection(
- ice_servers, constraints, allocator_factory_.get(), dtls_service, this);
+ ice_servers, constraints, allocator_factory_.get(), this,
+ dtls_identity_store_.get());
return peer_connection_.get() != NULL;
}

Powered by Google App Engine
This is Rietveld 408576698