| Index: talk/session/media/mediasession_unittest.cc
|
| diff --git a/talk/session/media/mediasession_unittest.cc b/talk/session/media/mediasession_unittest.cc
|
| index 7fd1d638239b0c07d75af73d227c709adde4ace3..5bb4b7eb04f2cce9361000eaaa3a01213c4ac914 100644
|
| --- a/talk/session/media/mediasession_unittest.cc
|
| +++ b/talk/session/media/mediasession_unittest.cc
|
| @@ -38,6 +38,7 @@
|
| #include "webrtc/base/fakesslidentity.h"
|
| #include "webrtc/base/gunit.h"
|
| #include "webrtc/base/messagedigest.h"
|
| +#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/ssladapter.h"
|
|
|
| #ifdef HAVE_SRTP
|
| @@ -216,15 +217,22 @@ static std::vector<std::string> GetCodecNames(const std::vector<T>& codecs) {
|
| class MediaSessionDescriptionFactoryTest : public testing::Test {
|
| public:
|
| MediaSessionDescriptionFactoryTest()
|
| - : f1_(&tdf1_), f2_(&tdf2_), id1_("id1"), id2_("id2") {
|
| + : f1_(&tdf1_),
|
| + f2_(&tdf2_),
|
| + cert1_(webrtc::DtlsCertificate::Create(
|
| + rtc::scoped_ptr<rtc::SSLIdentity>(
|
| + new rtc::FakeSSLIdentity("id1")).Pass())),
|
| + cert2_(webrtc::DtlsCertificate::Create(
|
| + rtc::scoped_ptr<rtc::SSLIdentity>(
|
| + new rtc::FakeSSLIdentity("id2")).Pass())) {
|
| f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1));
|
| f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1));
|
| f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1));
|
| f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2));
|
| f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2));
|
| f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2));
|
| - tdf1_.set_identity(&id1_);
|
| - tdf2_.set_identity(&id2_);
|
| + tdf1_.set_certificate(cert1_);
|
| + tdf2_.set_certificate(cert2_);
|
| }
|
|
|
| // Create a video StreamParamsVec object with:
|
| @@ -463,8 +471,8 @@ class MediaSessionDescriptionFactoryTest : public testing::Test {
|
| MediaSessionDescriptionFactory f2_;
|
| TransportDescriptionFactory tdf1_;
|
| TransportDescriptionFactory tdf2_;
|
| - rtc::FakeSSLIdentity id1_;
|
| - rtc::FakeSSLIdentity id2_;
|
| + rtc::scoped_refptr<webrtc::DtlsCertificate> cert1_;
|
| + rtc::scoped_refptr<webrtc::DtlsCertificate> cert2_;
|
| };
|
|
|
| // Create a typical audio offer, and ensure it matches what we expect.
|
|
|