OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2016 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2016 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 | 78 |
79 class TrackMediaInfoMapTest : public testing::Test { | 79 class TrackMediaInfoMapTest : public testing::Test { |
80 public: | 80 public: |
81 TrackMediaInfoMapTest() | 81 TrackMediaInfoMapTest() |
82 : voice_media_info_(new cricket::VoiceMediaInfo()), | 82 : voice_media_info_(new cricket::VoiceMediaInfo()), |
83 video_media_info_(new cricket::VideoMediaInfo()), | 83 video_media_info_(new cricket::VideoMediaInfo()), |
84 local_audio_track_(AudioTrack::Create("LocalAudioTrack", nullptr)), | 84 local_audio_track_(AudioTrack::Create("LocalAudioTrack", nullptr)), |
85 remote_audio_track_(AudioTrack::Create("RemoteAudioTrack", nullptr)), | 85 remote_audio_track_(AudioTrack::Create("RemoteAudioTrack", nullptr)), |
86 local_video_track_( | 86 local_video_track_( |
87 VideoTrack::Create("LocalVideoTrack", | 87 VideoTrack::Create("LocalVideoTrack", |
88 FakeVideoTrackSource::Create(false))), | 88 FakeVideoTrackSource::Create(false), |
| 89 rtc::Thread::Current())), |
89 remote_video_track_( | 90 remote_video_track_( |
90 VideoTrack::Create("RemoteVideoTrack", | 91 VideoTrack::Create("RemoteVideoTrack", |
91 FakeVideoTrackSource::Create(false))) {} | 92 FakeVideoTrackSource::Create(false), |
| 93 rtc::Thread::Current())) {} |
92 | 94 |
93 ~TrackMediaInfoMapTest() { | 95 ~TrackMediaInfoMapTest() { |
94 // If we have a map the ownership has been passed to the map, only delete if | 96 // If we have a map the ownership has been passed to the map, only delete if |
95 // |CreateMap| has not been called. | 97 // |CreateMap| has not been called. |
96 if (!map_) { | 98 if (!map_) { |
97 delete voice_media_info_; | 99 delete voice_media_info_; |
98 delete video_media_info_; | 100 delete video_media_info_; |
99 } | 101 } |
100 } | 102 } |
101 | 103 |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
401 AddRtpReceiverWithSsrcs({1, 2}, remote_audio_track_); | 403 AddRtpReceiverWithSsrcs({1, 2}, remote_audio_track_); |
402 AddRtpReceiverWithSsrcs({3, 4}, remote_audio_track_); | 404 AddRtpReceiverWithSsrcs({3, 4}, remote_audio_track_); |
403 AddRtpReceiverWithSsrcs({5, 6}, remote_video_track_); | 405 AddRtpReceiverWithSsrcs({5, 6}, remote_video_track_); |
404 AddRtpReceiverWithSsrcs({7, 8}, remote_video_track_); | 406 AddRtpReceiverWithSsrcs({7, 8}, remote_video_track_); |
405 EXPECT_DEATH(CreateMap(), ""); | 407 EXPECT_DEATH(CreateMap(), ""); |
406 } | 408 } |
407 | 409 |
408 #endif // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID) | 410 #endif // RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID) |
409 | 411 |
410 } // namespace webrtc | 412 } // namespace webrtc |
OLD | NEW |