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

Unified Diff: talk/app/webrtc/peerconnection_unittest.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/peerconnection_unittest.cc
diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc
index 99ee9be867168a99ca9f6fe898ce2517aede4a56..2b0a7625021b5b299419556747a406ef080c5b00 100644
--- a/talk/app/webrtc/peerconnection_unittest.cc
+++ b/talk/app/webrtc/peerconnection_unittest.cc
@@ -40,7 +40,7 @@
#include "talk/app/webrtc/peerconnectioninterface.h"
#include "talk/app/webrtc/test/fakeaudiocapturemodule.h"
#include "talk/app/webrtc/test/fakeconstraints.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/fakevideotrackrenderer.h"
#include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
@@ -772,20 +772,20 @@ class JsepTestClient
remove_sdes_(false) {
}
- virtual rtc::scoped_refptr<webrtc::PeerConnectionInterface>
- CreatePeerConnection(webrtc::PortAllocatorFactoryInterface* factory,
- const MediaConstraintsInterface* constraints) {
+ rtc::scoped_refptr<webrtc::PeerConnectionInterface>
+ CreatePeerConnection(
+ webrtc::PortAllocatorFactoryInterface* factory,
+ const MediaConstraintsInterface* constraints) override {
// CreatePeerConnection with IceServers.
webrtc::PeerConnectionInterface::IceServers ice_servers;
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = "stun:stun.l.google.com:19302";
ice_servers.push_back(ice_server);
- FakeIdentityService* dtls_service =
- rtc::SSLStreamAdapter::HaveDtlsSrtp() ?
- new FakeIdentityService() : NULL;
+ dtls_identity_store_.reset(rtc::SSLStreamAdapter::HaveDtlsSrtp() ?
+ new FakeDtlsIdentityStoreRSA() : nullptr);
return peer_connection_factory()->CreatePeerConnection(
- ice_servers, constraints, factory, dtls_service, this);
+ ice_servers, constraints, factory, this, dtls_identity_store_.get());
}
void HandleIncomingOffer(const std::string& msg) {
@@ -898,6 +898,7 @@ class JsepTestClient
rtc::scoped_refptr<DataChannelInterface> data_channel_;
rtc::scoped_ptr<MockDataChannelObserver> data_observer_;
+ rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store_;
};
template <typename SignalingClass>

Powered by Google App Engine
This is Rietveld 408576698