Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1749)

Unified Diff: webrtc/base/ssladapter_unittest.cc

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/socket_unittest.cc ('k') | webrtc/base/sslidentity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
};
« no previous file with comments | « webrtc/base/socket_unittest.cc ('k') | webrtc/base/sslidentity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698