Index: webrtc/p2p/base/transportcontroller_unittest.cc |
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc |
index c90fd700ce34e75c3a407a0eecd1944600b7b559..e8e6f5f9fd1e2f4990235f861daffe8cbd8c2743 100644 |
--- a/webrtc/p2p/base/transportcontroller_unittest.cc |
+++ b/webrtc/p2p/base/transportcontroller_unittest.cc |
@@ -9,11 +9,11 @@ |
*/ |
#include <map> |
+#include <memory> |
#include "webrtc/base/fakesslidentity.h" |
#include "webrtc/base/gunit.h" |
#include "webrtc/base/helpers.h" |
-#include "webrtc/base/scoped_ptr.h" |
#include "webrtc/base/sslidentity.h" |
#include "webrtc/base/thread.h" |
#include "webrtc/p2p/base/dtlstransportchannel.h" |
@@ -177,8 +177,8 @@ class TransportControllerTest : public testing::Test, |
++candidates_signal_count_; |
} |
- rtc::scoped_ptr<rtc::Thread> worker_thread_; // Not used for most tests. |
- rtc::scoped_ptr<TransportControllerForTest> transport_controller_; |
+ std::unique_ptr<rtc::Thread> worker_thread_; // Not used for most tests. |
+ std::unique_ptr<TransportControllerForTest> transport_controller_; |
// Information received from signals from transport controller. |
IceConnectionState connection_state_ = cricket::kIceConnectionConnecting; |
@@ -269,10 +269,10 @@ TEST_F(TransportControllerTest, TestGetSslRole) { |
TEST_F(TransportControllerTest, TestSetAndGetLocalCertificate) { |
rtc::scoped_refptr<rtc::RTCCertificate> certificate1 = |
- rtc::RTCCertificate::Create(rtc::scoped_ptr<rtc::SSLIdentity>( |
+ rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>( |
rtc::SSLIdentity::Generate("session1", rtc::KT_DEFAULT))); |
rtc::scoped_refptr<rtc::RTCCertificate> certificate2 = |
- rtc::RTCCertificate::Create(rtc::scoped_ptr<rtc::SSLIdentity>( |
+ rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>( |
rtc::SSLIdentity::Generate("session2", rtc::KT_DEFAULT))); |
rtc::scoped_refptr<rtc::RTCCertificate> returned_certificate; |
@@ -308,7 +308,7 @@ TEST_F(TransportControllerTest, TestGetRemoteSSLCertificate) { |
ASSERT_NE(nullptr, channel); |
channel->SetRemoteSSLCertificate(&fake_certificate); |
- rtc::scoped_ptr<rtc::SSLCertificate> returned_certificate = |
+ std::unique_ptr<rtc::SSLCertificate> returned_certificate = |
transport_controller_->GetRemoteSSLCertificate("audio"); |
EXPECT_TRUE(returned_certificate); |
EXPECT_EQ(fake_certificate.ToPEMString(), |