diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc index 4b127af234..f1c0c1eae4 100644 --- a/media/engine/webrtc_voice_engine_unittest.cc +++ b/media/engine/webrtc_voice_engine_unittest.cc @@ -148,7 +148,7 @@ TEST(WebRtcVoiceEngineTestStubLibrary, StartupShutdown) { AdmSetupExpectations(adm); rtc::scoped_refptr> apm = use_null_apm ? nullptr - : new rtc::RefCountedObject< + : rtc::make_ref_counted< StrictMock>(); webrtc::AudioProcessing::Config apm_config; @@ -188,7 +188,7 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam { adm_(webrtc::test::MockAudioDeviceModule::CreateStrict()), apm_(use_null_apm_ ? nullptr - : new rtc::RefCountedObject< + : rtc::make_ref_counted< StrictMock>()), call_(), override_field_trials_(field_trials) { @@ -3656,10 +3656,8 @@ TEST(WebRtcVoiceEngineTest, StartupShutdownWithExternalADM) { for (bool use_null_apm : {false, true}) { std::unique_ptr task_queue_factory = webrtc::CreateDefaultTaskQueueFactory(); - rtc::scoped_refptr>> - adm(new rtc::RefCountedObject< - ::testing::NiceMock>()); + auto adm = rtc::make_ref_counted< + ::testing::NiceMock>(); { rtc::scoped_refptr apm = use_null_apm ? nullptr : webrtc::AudioProcessingBuilder().Create(); @@ -3682,7 +3680,8 @@ TEST(WebRtcVoiceEngineTest, StartupShutdownWithExternalADM) { delete channel; } // The engine/channel should have dropped their references. - EXPECT_TRUE(adm->HasOneRef()); + EXPECT_EQ(adm.release()->Release(), + rtc::RefCountReleaseStatus::kDroppedLastRef); } } @@ -3844,7 +3843,7 @@ TEST(WebRtcVoiceEngineTest, CollectRecvCodecs) { rtc::scoped_refptr unused_encoder_factory = webrtc::MockAudioEncoderFactory::CreateUnusedFactory(); rtc::scoped_refptr mock_decoder_factory = - new rtc::RefCountedObject; + rtc::make_ref_counted(); EXPECT_CALL(*mock_decoder_factory.get(), GetSupportedDecoders()) .WillOnce(Return(specs)); rtc::scoped_refptr adm =