Index: webrtc/base/sslstreamadapter_unittest.cc |
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc |
index 8d5b275db8c19d6ecb9ea784f07edb8da4c98049..ac9fef9f248ad15ca09c83a68af58270a602daf2 100644 |
--- a/webrtc/base/sslstreamadapter_unittest.cc |
+++ b/webrtc/base/sslstreamadapter_unittest.cc |
@@ -10,13 +10,13 @@ |
#include <algorithm> |
+#include <memory> |
#include <set> |
#include <string> |
#include "webrtc/base/bufferqueue.h" |
#include "webrtc/base/gunit.h" |
#include "webrtc/base/helpers.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/ssladapter.h" |
#include "webrtc/base/sslconfig.h" |
#include "webrtc/base/sslidentity.h" |
@@ -474,7 +474,7 @@ class SSLStreamAdapterTestBase : public testing::Test, |
return server_ssl_->GetDtlsSrtpCryptoSuite(retval); |
} |
- rtc::scoped_ptr<rtc::SSLCertificate> GetPeerCertificate(bool client) { |
+ std::unique_ptr<rtc::SSLCertificate> GetPeerCertificate(bool client) { |
if (client) |
return client_ssl_->GetPeerCertificate(); |
else |
@@ -526,8 +526,8 @@ class SSLStreamAdapterTestBase : public testing::Test, |
rtc::KeyParams server_key_type_; |
SSLDummyStreamBase *client_stream_; // freed by client_ssl_ destructor |
SSLDummyStreamBase *server_stream_; // freed by server_ssl_ destructor |
- rtc::scoped_ptr<rtc::SSLStreamAdapter> client_ssl_; |
- rtc::scoped_ptr<rtc::SSLStreamAdapter> server_ssl_; |
+ std::unique_ptr<rtc::SSLStreamAdapter> client_ssl_; |
+ std::unique_ptr<rtc::SSLStreamAdapter> server_ssl_; |
rtc::SSLIdentity *client_identity_; // freed by client_ssl_ destructor |
rtc::SSLIdentity *server_identity_; // freed by server_ssl_ destructor |
int delay_; |
@@ -1043,7 +1043,7 @@ TEST_F(SSLStreamAdapterTestDTLSFromPEMStrings, TestDTLSGetPeerCertificate) { |
TestHandshake(); |
// The client should have a peer certificate after the handshake. |
- rtc::scoped_ptr<rtc::SSLCertificate> client_peer_cert = |
+ std::unique_ptr<rtc::SSLCertificate> client_peer_cert = |
GetPeerCertificate(true); |
ASSERT_TRUE(client_peer_cert); |
@@ -1055,7 +1055,7 @@ TEST_F(SSLStreamAdapterTestDTLSFromPEMStrings, TestDTLSGetPeerCertificate) { |
ASSERT_FALSE(client_peer_cert->GetChain()); |
// The server should have a peer certificate after the handshake. |
- rtc::scoped_ptr<rtc::SSLCertificate> server_peer_cert = |
+ std::unique_ptr<rtc::SSLCertificate> server_peer_cert = |
GetPeerCertificate(false); |
ASSERT_TRUE(server_peer_cert); |