Index: talk/app/webrtc/peerconnectioninterface.h |
diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h |
index 3e4cb556fb5f51826734c719a5cf3f6e46bc36e8..c90d60dbcaf478d4c548c03637499fb27b9630c3 100644 |
--- a/talk/app/webrtc/peerconnectioninterface.h |
+++ b/talk/app/webrtc/peerconnectioninterface.h |
@@ -79,6 +79,7 @@ |
#include "talk/app/webrtc/umametrics.h" |
#include "webrtc/base/fileutils.h" |
#include "webrtc/base/network.h" |
+#include "webrtc/base/sslidentity.h" |
#include "webrtc/base/sslstreamadapter.h" |
#include "webrtc/base/socketaddress.h" |
@@ -547,6 +548,7 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface { |
const MediaConstraintsInterface* constraints, |
PortAllocatorFactoryInterface* allocator_factory, |
DTLSIdentityServiceInterface* dtls_identity_service, |
+ rtc::KeyType key_type, |
PeerConnectionObserver* observer) = 0; |
// TODO(mallinath) : Remove below versions after clients are updated |
@@ -561,11 +563,37 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface { |
const MediaConstraintsInterface* constraints, |
PortAllocatorFactoryInterface* allocator_factory, |
DTLSIdentityServiceInterface* dtls_identity_service, |
+ rtc::KeyType key_type, |
PeerConnectionObserver* observer) { |
PeerConnectionInterface::RTCConfiguration rtc_config; |
rtc_config.servers = servers; |
return CreatePeerConnection(rtc_config, constraints, allocator_factory, |
- dtls_identity_service, observer); |
+ dtls_identity_service, key_type, observer); |
+ } |
+ |
+ // TODO(hbos): Remove once chromium uses CreatePeerConnection with KeyType. |
+ inline rtc::scoped_refptr<PeerConnectionInterface> |
+ CreatePeerConnection( |
+ const PeerConnectionInterface::RTCConfiguration& configuration, |
+ const MediaConstraintsInterface* constraints, |
+ PortAllocatorFactoryInterface* allocator_factory, |
+ DTLSIdentityServiceInterface* dtls_identity_service, |
+ PeerConnectionObserver* observer) { |
+ return CreatePeerConnection(configuration, constraints, allocator_factory, |
+ dtls_identity_service, rtc::KT_DEFAULT, |
+ observer); |
+ } |
+ // TODO(hbos): Remove once chromium uses CreatePeerConnection with KeyType. |
+ inline rtc::scoped_refptr<PeerConnectionInterface> |
+ CreatePeerConnection( |
+ const PeerConnectionInterface::IceServers& servers, |
+ const MediaConstraintsInterface* constraints, |
+ PortAllocatorFactoryInterface* allocator_factory, |
+ DTLSIdentityServiceInterface* dtls_identity_service, |
+ PeerConnectionObserver* observer) { |
+ return CreatePeerConnection(servers, constraints, allocator_factory, |
+ dtls_identity_service, rtc::KT_DEFAULT, |
+ observer); |
} |
virtual rtc::scoped_refptr<MediaStreamInterface> |