Index: webrtc/base/ssladapter_unittest.cc |
diff --git a/webrtc/base/ssladapter_unittest.cc b/webrtc/base/ssladapter_unittest.cc |
index 7869b6eb63bc04faeee50f98adda8fb941f41092..16e5c2ea3227a1a01f2d02826b94bd15885d01d6 100644 |
--- a/webrtc/base/ssladapter_unittest.cc |
+++ b/webrtc/base/ssladapter_unittest.cc |
@@ -8,6 +8,7 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
+#include <memory> |
#include <string> |
#include "webrtc/base/gunit.h" |
@@ -123,7 +124,7 @@ class SSLAdapterTestDummyClient : public sigslot::has_slots<> { |
private: |
const rtc::SSLMode ssl_mode_; |
- rtc::scoped_ptr<rtc::SSLAdapter> ssl_adapter_; |
+ std::unique_ptr<rtc::SSLAdapter> ssl_adapter_; |
std::string data_; |
}; |
@@ -259,10 +260,10 @@ class SSLAdapterTestDummyServer : public sigslot::has_slots<> { |
const rtc::SSLMode ssl_mode_; |
- rtc::scoped_ptr<rtc::AsyncSocket> server_socket_; |
- rtc::scoped_ptr<rtc::SSLStreamAdapter> ssl_stream_adapter_; |
+ std::unique_ptr<rtc::AsyncSocket> server_socket_; |
+ std::unique_ptr<rtc::SSLStreamAdapter> ssl_stream_adapter_; |
- rtc::scoped_ptr<rtc::SSLIdentity> ssl_identity_; |
+ std::unique_ptr<rtc::SSLIdentity> ssl_identity_; |
std::string data_; |
}; |
@@ -339,8 +340,8 @@ class SSLAdapterTestBase : public testing::Test, |
const rtc::SocketServerScope ss_scope_; |
- rtc::scoped_ptr<SSLAdapterTestDummyServer> server_; |
- rtc::scoped_ptr<SSLAdapterTestDummyClient> client_; |
+ std::unique_ptr<SSLAdapterTestDummyServer> server_; |
+ std::unique_ptr<SSLAdapterTestDummyClient> client_; |
int handshake_wait_; |
}; |