Index: webrtc/base/opensslstreamadapter.h |
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h |
index 463c8f2280b83f74481f3710ef1fa5a6cccca677..1e90bacc0e463c8368a2d017615281bd88a5099a 100644 |
--- a/webrtc/base/opensslstreamadapter.h |
+++ b/webrtc/base/opensslstreamadapter.h |
@@ -12,6 +12,7 @@ |
#define WEBRTC_BASE_OPENSSLSTREAMADAPTER_H__ |
#include <string> |
+#include <memory> |
#include <vector> |
#include "webrtc/base/buffer.h" |
@@ -69,7 +70,7 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter { |
const unsigned char* digest_val, |
size_t digest_len) override; |
- rtc::scoped_ptr<SSLCertificate> GetPeerCertificate() const override; |
+ std::unique_ptr<SSLCertificate> GetPeerCertificate() const override; |
int StartSSLWithServer(const char* server_name) override; |
int StartSSLWithPeer() override; |
@@ -184,13 +185,13 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter { |
SSL_CTX* ssl_ctx_; |
// Our key and certificate, mostly useful in peer-to-peer mode. |
- scoped_ptr<OpenSSLIdentity> identity_; |
+ std::unique_ptr<OpenSSLIdentity> identity_; |
// in traditional mode, the server name that the server's certificate |
// must specify. Empty in peer-to-peer mode. |
std::string ssl_server_name_; |
// The certificate that the peer must present or did present. Initially |
// null in traditional mode, until the connection is established. |
- scoped_ptr<OpenSSLCertificate> peer_certificate_; |
+ std::unique_ptr<OpenSSLCertificate> peer_certificate_; |
// In peer-to-peer mode, the digest of the certificate that |
// the peer must present. |
Buffer peer_certificate_digest_value_; |