zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert WebRtcVoiceEngine tests to rtc::make_ref_counted

Browse Source 
Bug: webrtc:12701
Change-Id: I8d6fb12a657c61112415aeffb25f177c1c81f03a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/229589
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34960}
This commit is contained in:
Niels Möller
2021-08-23 13:51:44 +02:00
committed by WebRTC LUCI CQ
parent 66e06055f1
commit fb501792eb
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/engine/webrtc_voice_engine_unittest.cc
View File

@ -148,7 +148,7 @@ TEST(WebRtcVoiceEngineTestStubLibrary, StartupShutdown) {
AdmSetupExpectations(adm); AdmSetupExpectations(adm);
rtc::scoped_refptr<StrictMock<webrtc::test::MockAudioProcessing>> apm = rtc::scoped_refptr<StrictMock<webrtc::test::MockAudioProcessing>> apm =
use_null_apm ? nullptr use_null_apm ? nullptr
: new rtc::RefCountedObject< : rtc::make_ref_counted<
StrictMock<webrtc::test::MockAudioProcessing>>(); StrictMock<webrtc::test::MockAudioProcessing>>();
webrtc::AudioProcessing::Config apm_config; webrtc::AudioProcessing::Config apm_config;
@ -188,7 +188,7 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
adm_(webrtc::test::MockAudioDeviceModule::CreateStrict()), adm_(webrtc::test::MockAudioDeviceModule::CreateStrict()),
apm_(use_null_apm_ apm_(use_null_apm_
? nullptr ? nullptr
: new rtc::RefCountedObject< : rtc::make_ref_counted<
StrictMock<webrtc::test::MockAudioProcessing>>()), StrictMock<webrtc::test::MockAudioProcessing>>()),
call_(), call_(),
override_field_trials_(field_trials) { override_field_trials_(field_trials) {
@ -3656,10 +3656,8 @@ TEST(WebRtcVoiceEngineTest, StartupShutdownWithExternalADM) {
for (bool use_null_apm : {false, true}) { for (bool use_null_apm : {false, true}) {
std::unique_ptr<webrtc::TaskQueueFactory> task_queue_factory = std::unique_ptr<webrtc::TaskQueueFactory> task_queue_factory =
webrtc::CreateDefaultTaskQueueFactory(); webrtc::CreateDefaultTaskQueueFactory();
rtc::scoped_refptr<rtc::RefCountedObject< auto adm = rtc::make_ref_counted<
::testing::NiceMock<webrtc::test::MockAudioDeviceModule>>> ::testing::NiceMock<webrtc::test::MockAudioDeviceModule>>();
adm(new rtc::RefCountedObject<
::testing::NiceMock<webrtc::test::MockAudioDeviceModule>>());
{ {
rtc::scoped_refptr<webrtc::AudioProcessing> apm = rtc::scoped_refptr<webrtc::AudioProcessing> apm =
use_null_apm ? nullptr : webrtc::AudioProcessingBuilder().Create(); use_null_apm ? nullptr : webrtc::AudioProcessingBuilder().Create();
@ -3682,7 +3680,8 @@ TEST(WebRtcVoiceEngineTest, StartupShutdownWithExternalADM) {
delete channel; delete channel;
} }
// The engine/channel should have dropped their references. // 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<webrtc::MockAudioEncoderFactory> unused_encoder_factory = rtc::scoped_refptr<webrtc::MockAudioEncoderFactory> unused_encoder_factory =
webrtc::MockAudioEncoderFactory::CreateUnusedFactory(); webrtc::MockAudioEncoderFactory::CreateUnusedFactory();
rtc::scoped_refptr<webrtc::MockAudioDecoderFactory> mock_decoder_factory = rtc::scoped_refptr<webrtc::MockAudioDecoderFactory> mock_decoder_factory =
new rtc::RefCountedObject<webrtc::MockAudioDecoderFactory>; rtc::make_ref_counted<webrtc::MockAudioDecoderFactory>();
EXPECT_CALL(*mock_decoder_factory.get(), GetSupportedDecoders()) EXPECT_CALL(*mock_decoder_factory.get(), GetSupportedDecoders())
.WillOnce(Return(specs)); .WillOnce(Return(specs));
rtc::scoped_refptr<webrtc::test::MockAudioDeviceModule> adm = rtc::scoped_refptr<webrtc::test::MockAudioDeviceModule> adm =