| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 2386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2397 MediaProtocolTest() : f1_(&tdf1_), f2_(&tdf2_) { | 2397 MediaProtocolTest() : f1_(&tdf1_), f2_(&tdf2_) { |
| 2398 f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1)); | 2398 f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1)); |
| 2399 f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1)); | 2399 f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1)); |
| 2400 f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1)); | 2400 f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1)); |
| 2401 f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2)); | 2401 f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2)); |
| 2402 f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2)); | 2402 f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2)); |
| 2403 f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2)); | 2403 f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2)); |
| 2404 f1_.set_secure(SEC_ENABLED); | 2404 f1_.set_secure(SEC_ENABLED); |
| 2405 f2_.set_secure(SEC_ENABLED); | 2405 f2_.set_secure(SEC_ENABLED); |
| 2406 tdf1_.set_certificate(rtc::RTCCertificate::Create( | 2406 tdf1_.set_certificate(rtc::RTCCertificate::Create( |
| 2407 rtc::scoped_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id1")))); | 2407 std::unique_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id1")))); |
| 2408 tdf2_.set_certificate(rtc::RTCCertificate::Create( | 2408 tdf2_.set_certificate(rtc::RTCCertificate::Create( |
| 2409 rtc::scoped_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id2")))); | 2409 std::unique_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id2")))); |
| 2410 tdf1_.set_secure(SEC_ENABLED); | 2410 tdf1_.set_secure(SEC_ENABLED); |
| 2411 tdf2_.set_secure(SEC_ENABLED); | 2411 tdf2_.set_secure(SEC_ENABLED); |
| 2412 } | 2412 } |
| 2413 | 2413 |
| 2414 protected: | 2414 protected: |
| 2415 MediaSessionDescriptionFactory f1_; | 2415 MediaSessionDescriptionFactory f1_; |
| 2416 MediaSessionDescriptionFactory f2_; | 2416 MediaSessionDescriptionFactory f2_; |
| 2417 TransportDescriptionFactory tdf1_; | 2417 TransportDescriptionFactory tdf1_; |
| 2418 TransportDescriptionFactory tdf2_; | 2418 TransportDescriptionFactory tdf2_; |
| 2419 }; | 2419 }; |
| (...skipping 23 matching lines...) Expand all Loading... |
| 2443 EXPECT_EQ(GetParam(), acd->protocol()); | 2443 EXPECT_EQ(GetParam(), acd->protocol()); |
| 2444 EXPECT_EQ(GetParam(), vcd->protocol()); | 2444 EXPECT_EQ(GetParam(), vcd->protocol()); |
| 2445 } | 2445 } |
| 2446 | 2446 |
| 2447 INSTANTIATE_TEST_CASE_P(MediaProtocolPatternTest, | 2447 INSTANTIATE_TEST_CASE_P(MediaProtocolPatternTest, |
| 2448 MediaProtocolTest, | 2448 MediaProtocolTest, |
| 2449 ::testing::ValuesIn(kMediaProtocols)); | 2449 ::testing::ValuesIn(kMediaProtocols)); |
| 2450 INSTANTIATE_TEST_CASE_P(MediaProtocolDtlsPatternTest, | 2450 INSTANTIATE_TEST_CASE_P(MediaProtocolDtlsPatternTest, |
| 2451 MediaProtocolTest, | 2451 MediaProtocolTest, |
| 2452 ::testing::ValuesIn(kMediaProtocolsDtls)); | 2452 ::testing::ValuesIn(kMediaProtocolsDtls)); |
| OLD | NEW |