| Index: webrtc/pc/channel_unittest.cc
|
| diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
|
| index 867b5b3e3677547115e6e53fa6a76aa084b0a433..6039065e8321b38757834d9ef940d41ae144c113 100644
|
| --- a/webrtc/pc/channel_unittest.cc
|
| +++ b/webrtc/pc/channel_unittest.cc
|
| @@ -162,13 +162,13 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
|
| if (flags1 & DTLS) {
|
| // Confirmed to work with KT_RSA and KT_ECDSA.
|
| transport_controller1_.SetLocalCertificate(
|
| - rtc::RTCCertificate::Create(rtc::scoped_ptr<rtc::SSLIdentity>(
|
| + rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>(
|
| rtc::SSLIdentity::Generate("session1", rtc::KT_DEFAULT))));
|
| }
|
| if (flags2 & DTLS) {
|
| // Confirmed to work with KT_RSA and KT_ECDSA.
|
| transport_controller2_.SetLocalCertificate(
|
| - rtc::RTCCertificate::Create(rtc::scoped_ptr<rtc::SSLIdentity>(
|
| + rtc::RTCCertificate::Create(std::unique_ptr<rtc::SSLIdentity>(
|
| rtc::SSLIdentity::Generate("session2", rtc::KT_DEFAULT))));
|
| }
|
|
|
| @@ -981,7 +981,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
|
| uint16_t local_net_id = 1;
|
| uint16_t remote_net_id = 2;
|
| int last_packet_id = 100;
|
| - rtc::scoped_ptr<cricket::CandidatePairInterface> candidate_pair(
|
| + std::unique_ptr<cricket::CandidatePairInterface> candidate_pair(
|
| transport_controller1_.CreateFakeCandidatePair(
|
| local_address, local_net_id, remote_address, remote_net_id));
|
| transport_channel1->SignalSelectedCandidatePairChanged(
|
|
|