| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 class PeerConnectionInterfaceTest : public testing::Test { | 519 class PeerConnectionInterfaceTest : public testing::Test { |
| 520 protected: | 520 protected: |
| 521 PeerConnectionInterfaceTest() { | 521 PeerConnectionInterfaceTest() { |
| 522 #ifdef WEBRTC_ANDROID | 522 #ifdef WEBRTC_ANDROID |
| 523 webrtc::InitializeAndroidObjects(); | 523 webrtc::InitializeAndroidObjects(); |
| 524 #endif | 524 #endif |
| 525 } | 525 } |
| 526 | 526 |
| 527 virtual void SetUp() { | 527 virtual void SetUp() { |
| 528 pc_factory_ = webrtc::CreatePeerConnectionFactory( | 528 pc_factory_ = webrtc::CreatePeerConnectionFactory( |
| 529 rtc::Thread::Current(), rtc::Thread::Current(), NULL, NULL, | 529 rtc::Thread::Current(), rtc::Thread::Current(), rtc::Thread::Current(), |
| 530 NULL); | 530 nullptr, nullptr, nullptr); |
| 531 ASSERT_TRUE(pc_factory_.get() != NULL); | 531 RTC_DCHECK(pc_factory_); |
| 532 } | 532 } |
| 533 | 533 |
| 534 void CreatePeerConnection() { | 534 void CreatePeerConnection() { |
| 535 CreatePeerConnection("", "", NULL); | 535 CreatePeerConnection("", "", NULL); |
| 536 } | 536 } |
| 537 | 537 |
| 538 void CreatePeerConnection(webrtc::MediaConstraintsInterface* constraints) { | 538 void CreatePeerConnection(webrtc::MediaConstraintsInterface* constraints) { |
| 539 CreatePeerConnection("", "", constraints); | 539 CreatePeerConnection("", "", constraints); |
| 540 } | 540 } |
| 541 | 541 |
| (...skipping 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2661 FakeConstraints updated_answer_c; | 2661 FakeConstraints updated_answer_c; |
| 2662 answer_c.SetMandatoryReceiveAudio(false); | 2662 answer_c.SetMandatoryReceiveAudio(false); |
| 2663 answer_c.SetMandatoryReceiveVideo(false); | 2663 answer_c.SetMandatoryReceiveVideo(false); |
| 2664 | 2664 |
| 2665 cricket::MediaSessionOptions updated_answer_options; | 2665 cricket::MediaSessionOptions updated_answer_options; |
| 2666 EXPECT_TRUE( | 2666 EXPECT_TRUE( |
| 2667 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); | 2667 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); |
| 2668 EXPECT_TRUE(updated_answer_options.has_audio()); | 2668 EXPECT_TRUE(updated_answer_options.has_audio()); |
| 2669 EXPECT_TRUE(updated_answer_options.has_video()); | 2669 EXPECT_TRUE(updated_answer_options.has_video()); |
| 2670 } | 2670 } |
| OLD | NEW |