| Index: talk/session/media/channel_unittest.cc
|
| diff --git a/talk/session/media/channel_unittest.cc b/talk/session/media/channel_unittest.cc
|
| index 84a14e15519e753cf3c727392cee061325adb619..f9c3828f6905aea76a9061ba44a083124589dc6d 100644
|
| --- a/talk/session/media/channel_unittest.cc
|
| +++ b/talk/session/media/channel_unittest.cc
|
| @@ -195,12 +195,18 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
|
| CopyContent(local_media_content2_, &remote_media_content2_);
|
|
|
| if (flags1 & DTLS) {
|
| - identity1_.reset(rtc::SSLIdentity::Generate("session1"));
|
| - session1_.set_ssl_identity(identity1_.get());
|
| + rtc::scoped_refptr<webrtc::DtlsCertificate> certificate =
|
| + webrtc::DtlsCertificate::Create(
|
| + rtc::scoped_ptr<rtc::SSLIdentity>(
|
| + rtc::SSLIdentity::Generate("session1")).Pass());
|
| + session1_.set_ssl_certificate(certificate);
|
| }
|
| if (flags2 & DTLS) {
|
| - identity2_.reset(rtc::SSLIdentity::Generate("session2"));
|
| - session2_.set_ssl_identity(identity2_.get());
|
| + rtc::scoped_refptr<webrtc::DtlsCertificate> certificate =
|
| + webrtc::DtlsCertificate::Create(
|
| + rtc::scoped_ptr<rtc::SSLIdentity>(
|
| + rtc::SSLIdentity::Generate("session2")).Pass());
|
| + session2_.set_ssl_certificate(certificate);
|
| }
|
|
|
| // Add stream information (SSRC) to the local content but not to the remote
|
| @@ -1789,8 +1795,6 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
|
| typename T::Content local_media_content2_;
|
| typename T::Content remote_media_content1_;
|
| typename T::Content remote_media_content2_;
|
| - rtc::scoped_ptr<rtc::SSLIdentity> identity1_;
|
| - rtc::scoped_ptr<rtc::SSLIdentity> identity2_;
|
| // The RTP and RTCP packets to send in the tests.
|
| std::string rtp_packet_;
|
| std::string rtcp_packet_;
|
|
|