diff options
| author | Henrik Boström <hbos@webrtc.org> | 2015-08-11 10:33:13 +0200 |
|---|---|---|
| committer | Henrik Boström <hbos@webrtc.org> | 2015-08-11 08:33:27 +0000 |
| commit | 5e56c5927e097f095aef2e9f7be49fd3d59221e1 (patch) | |
| tree | dc86ad40e5c14c3791fbfd1513c7b8897efd0280 /talk/app/webrtc/test/peerconnectiontestwrapper.cc | |
| parent | 0365a27f56aa2d2376d2f356bf70d161c3450244 (diff) | |
| download | webrtc-5e56c5927e097f095aef2e9f7be49fd3d59221e1.tar.gz | |
DtlsIdentityStoreInterface added and the implementation is called DtlsIdentityStoreImpl (previously named without the -Impl bit and without an interface).
DtlsIdentityStoreImpl is updated to take KeyType into account, something which will be relevant after this CL lands:
https://codereview.webrtc.org/1189583002
The DtlsIdentityService[Interface] classes are about to be removed (to be removed when Chromium no longer implements and uses the interface). This was an unnecessary layer of complexity. The FakeIdentityService is now instead a FakeDtlsIdentityStore.
Where a service was previously passed around, a store is now passed around.
Identity generation is now commonly performed using DtlsIdentityStoreInterface. Previously, if a service was not specified, WebRtcSessionDescriptionFactory could fall back on its own generation code. Now, a store has to be provided for generation to occur.
For more information about the steps being taken to land this without breaking Chromium, see referenced bug.
BUG=webrtc:4899
R=magjed@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1176383004 .
Cr-Commit-Position: refs/heads/master@{#9696}
Diffstat (limited to 'talk/app/webrtc/test/peerconnectiontestwrapper.cc')
| -rw-r--r-- | talk/app/webrtc/test/peerconnectiontestwrapper.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/talk/app/webrtc/test/peerconnectiontestwrapper.cc b/talk/app/webrtc/test/peerconnectiontestwrapper.cc index 91d4f508f7..aecdcbb52f 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 = + rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store( rtc::SSLStreamAdapter::HaveDtlsSrtp() ? - new FakeIdentityService() : NULL; + new FakeDtlsIdentityStore() : nullptr); peer_connection_ = peer_connection_factory_->CreatePeerConnection( - ice_servers, constraints, allocator_factory_.get(), dtls_service, this); + ice_servers, constraints, allocator_factory_.get(), + dtls_identity_store.Pass(), this); return peer_connection_.get() != NULL; } |