Chromium Code Reviews| Index: webrtc/p2p/base/session.h |
| diff --git a/webrtc/p2p/base/session.h b/webrtc/p2p/base/session.h |
| index 19ce3611b077b697990d2a932855bcaefe5852c1..49c1067313528267c9b7f208c69f9ede22bae4c0 100644 |
| --- a/webrtc/p2p/base/session.h |
| +++ b/webrtc/p2p/base/session.h |
| @@ -100,7 +100,7 @@ class TransportProxy : public sigslot::has_slots<> { |
| // Simple functions that thunk down to the same functions on Transport. |
| void SetIceRole(IceRole role); |
| - void SetIdentity(rtc::SSLIdentity* identity); |
| + void SetCertificate(rtc::scoped_refptr<webrtc::DtlsCertificate> certificate); |
| bool SetLocalTransportDescription(const TransportDescription& description, |
| ContentAction action, |
| std::string* error_desc); |
| @@ -317,14 +317,16 @@ class BaseSession : public sigslot::has_slots<>, |
| virtual void DestroyChannel(const std::string& content_name, |
| int component); |
| - rtc::SSLIdentity* identity() { return identity_; } |
| + rtc::scoped_refptr<webrtc::DtlsCertificate> certificate() { |
|
tommi (sloooow) - chröme
2015/08/10 16:10:54
also return by const ref
hbos
2015/08/12 08:55:15
Acknowledged.
|
| + return certificate_; |
| + } |
| // Set the ice connection receiving timeout. |
| void SetIceConnectionReceivingTimeout(int timeout_ms); |
| protected: |
| - // Specifies the identity to use in this session. |
| - bool SetIdentity(rtc::SSLIdentity* identity); |
| + // Specifies the certificate to use in this session. |
| + bool SetCertificate(rtc::scoped_refptr<webrtc::DtlsCertificate> certificate); |
| bool SetSslMaxProtocolVersion(rtc::SSLProtocolVersion version); |
| @@ -447,7 +449,7 @@ class BaseSession : public sigslot::has_slots<>, |
| const std::string content_type_; |
| const std::string transport_type_; |
| bool initiator_; |
| - rtc::SSLIdentity* identity_; |
| + rtc::scoped_refptr<webrtc::DtlsCertificate> certificate_; |
| rtc::SSLProtocolVersion ssl_max_version_; |
| rtc::scoped_ptr<const SessionDescription> local_description_; |
| rtc::scoped_ptr<SessionDescription> remote_description_; |