diff options
Diffstat (limited to 'pc/stats_collector_unittest.cc')
| -rw-r--r-- | pc/stats_collector_unittest.cc | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc index 3767081b56..c630c3af6c 100644 --- a/pc/stats_collector_unittest.cc +++ b/pc/stats_collector_unittest.cc @@ -96,7 +96,7 @@ class FakeAudioTrack : public MediaStreamTrack<AudioTrackInterface> { public: explicit FakeAudioTrack(const std::string& id) : MediaStreamTrack<AudioTrackInterface>(id), - processor_(new rtc::RefCountedObject<FakeAudioProcessor>()) {} + processor_(rtc::make_ref_counted<FakeAudioProcessor>()) {} std::string kind() const override { return "audio"; } AudioSourceInterface* GetSource() const override { return NULL; } void AddSink(AudioTrackSinkInterface* sink) override {} @@ -134,8 +134,7 @@ class FakeAudioTrackWithInitValue public: explicit FakeAudioTrackWithInitValue(const std::string& id) : MediaStreamTrack<AudioTrackInterface>(id), - processor_( - new rtc::RefCountedObject<FakeAudioProcessorWithInitValue>()) {} + processor_(rtc::make_ref_counted<FakeAudioProcessorWithInitValue>()) {} std::string kind() const override { return "audio"; } AudioSourceInterface* GetSource() const override { return NULL; } void AddSink(AudioTrackSinkInterface* sink) override {} @@ -600,7 +599,7 @@ class StatsCollectorForTest : public StatsCollector { class StatsCollectorTest : public ::testing::Test { protected: rtc::scoped_refptr<FakePeerConnectionForStats> CreatePeerConnection() { - return new rtc::RefCountedObject<FakePeerConnectionForStats>(); + return rtc::make_ref_counted<FakePeerConnectionForStats>(); } std::unique_ptr<StatsCollectorForTest> CreateStatsCollector( @@ -738,8 +737,7 @@ class StatsCollectorTest : public ::testing::Test { static rtc::scoped_refptr<MockRtpSenderInternal> CreateMockSender( rtc::scoped_refptr<MediaStreamTrackInterface> track, uint32_t ssrc) { - rtc::scoped_refptr<MockRtpSenderInternal> sender( - new rtc::RefCountedObject<MockRtpSenderInternal>()); + auto sender = rtc::make_ref_counted<MockRtpSenderInternal>(); EXPECT_CALL(*sender, track()).WillRepeatedly(Return(track)); EXPECT_CALL(*sender, ssrc()).WillRepeatedly(Return(ssrc)); EXPECT_CALL(*sender, media_type()) @@ -753,8 +751,7 @@ static rtc::scoped_refptr<MockRtpSenderInternal> CreateMockSender( static rtc::scoped_refptr<MockRtpReceiverInternal> CreateMockReceiver( rtc::scoped_refptr<MediaStreamTrackInterface> track, uint32_t ssrc) { - rtc::scoped_refptr<MockRtpReceiverInternal> receiver( - new rtc::RefCountedObject<MockRtpReceiverInternal>()); + auto receiver = rtc::make_ref_counted<MockRtpReceiverInternal>(); EXPECT_CALL(*receiver, track()).WillRepeatedly(Return(track)); EXPECT_CALL(*receiver, ssrc()).WillRepeatedly(Return(ssrc)); EXPECT_CALL(*receiver, media_type()) @@ -808,7 +805,7 @@ class StatsCollectorTrackTest : public StatsCollectorTest, rtc::scoped_refptr<RtpSenderInterface> AddOutgoingAudioTrack( FakePeerConnectionForStats* pc, StatsCollectorForTest* stats) { - audio_track_ = new rtc::RefCountedObject<FakeAudioTrack>(kLocalTrackId); + audio_track_ = rtc::make_ref_counted<FakeAudioTrack>(kLocalTrackId); if (GetParam()) { if (!stream_) stream_ = MediaStream::Create("streamid"); @@ -823,7 +820,7 @@ class StatsCollectorTrackTest : public StatsCollectorTest, // Adds a incoming audio track with a given SSRC into the stats. void AddIncomingAudioTrack(FakePeerConnectionForStats* pc, StatsCollectorForTest* stats) { - audio_track_ = new rtc::RefCountedObject<FakeAudioTrack>(kRemoteTrackId); + audio_track_ = rtc::make_ref_counted<FakeAudioTrack>(kRemoteTrackId); if (GetParam()) { if (stream_ == NULL) stream_ = MediaStream::Create("streamid"); @@ -1483,8 +1480,8 @@ TEST_P(StatsCollectorTrackTest, FilterOutNegativeInitialValues) { // Create a local stream with a local audio track and adds it to the stats. stream_ = MediaStream::Create("streamid"); - rtc::scoped_refptr<FakeAudioTrackWithInitValue> local_track( - new rtc::RefCountedObject<FakeAudioTrackWithInitValue>(kLocalTrackId)); + auto local_track = + rtc::make_ref_counted<FakeAudioTrackWithInitValue>(kLocalTrackId); stream_->AddTrack(local_track); pc->AddSender(CreateMockSender(local_track, kSsrcOfTrack)); if (GetParam()) { @@ -1495,8 +1492,8 @@ TEST_P(StatsCollectorTrackTest, FilterOutNegativeInitialValues) { // Create a remote stream with a remote audio track and adds it to the stats. rtc::scoped_refptr<MediaStream> remote_stream( MediaStream::Create("remotestreamid")); - rtc::scoped_refptr<FakeAudioTrackWithInitValue> remote_track( - new rtc::RefCountedObject<FakeAudioTrackWithInitValue>(kRemoteTrackId)); + auto remote_track = + rtc::make_ref_counted<FakeAudioTrackWithInitValue>(kRemoteTrackId); remote_stream->AddTrack(remote_track); pc->AddReceiver(CreateMockReceiver(remote_track, kSsrcOfTrack)); if (GetParam()) { @@ -1665,8 +1662,7 @@ TEST_P(StatsCollectorTrackTest, LocalAndRemoteTracksWithSameSsrc) { // Create a remote stream with a remote audio track and adds it to the stats. rtc::scoped_refptr<MediaStream> remote_stream( MediaStream::Create("remotestreamid")); - rtc::scoped_refptr<FakeAudioTrack> remote_track( - new rtc::RefCountedObject<FakeAudioTrack>(kRemoteTrackId)); + auto remote_track = rtc::make_ref_counted<FakeAudioTrack>(kRemoteTrackId); pc->AddReceiver(CreateMockReceiver(remote_track, kSsrcOfTrack)); remote_stream->AddTrack(remote_track); stats->AddStream(remote_stream); @@ -1755,8 +1751,7 @@ TEST_P(StatsCollectorTrackTest, TwoLocalTracksWithSameSsrc) { // Create a new audio track and adds it to the stream and stats. static const std::string kNewTrackId = "new_track_id"; - rtc::scoped_refptr<FakeAudioTrack> new_audio_track( - new rtc::RefCountedObject<FakeAudioTrack>(kNewTrackId)); + auto new_audio_track = rtc::make_ref_counted<FakeAudioTrack>(kNewTrackId); pc->AddSender(CreateMockSender(new_audio_track, kSsrcOfTrack)); stream_->AddTrack(new_audio_track); @@ -1785,8 +1780,8 @@ TEST_P(StatsCollectorTrackTest, TwoLocalSendersWithSameTrack) { auto pc = CreatePeerConnection(); auto stats = CreateStatsCollector(pc); - rtc::scoped_refptr<FakeAudioTrackWithInitValue> local_track( - new rtc::RefCountedObject<FakeAudioTrackWithInitValue>(kLocalTrackId)); + auto local_track = + rtc::make_ref_counted<FakeAudioTrackWithInitValue>(kLocalTrackId); pc->AddSender(CreateMockSender(local_track, kFirstSsrc)); stats->AddLocalAudioTrack(local_track.get(), kFirstSsrc); pc->AddSender(CreateMockSender(local_track, kSecondSsrc)); |