diff --git a/api/voip/voip_engine_factory_unittest.cc b/api/voip/voip_engine_factory_unittest.cc index d0b8438368..84b474f3b8 100644 --- a/api/voip/voip_engine_factory_unittest.cc +++ b/api/voip/voip_engine_factory_unittest.cc @@ -28,7 +28,7 @@ TEST(VoipEngineFactoryTest, CreateEngineWithMockModules) { config.decoder_factory = new rtc::RefCountedObject(); config.task_queue_factory = CreateDefaultTaskQueueFactory(); config.audio_processing = - new rtc::RefCountedObject(); + new rtc::RefCountedObject>(); config.audio_device_module = test::MockAudioDeviceModule::CreateNice(); auto voip_engine = CreateVoipEngine(std::move(config)); diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc index f0f150a0b5..fcd691ea80 100644 --- a/audio/audio_receive_stream_unittest.cc +++ b/audio/audio_receive_stream_unittest.cc @@ -36,6 +36,7 @@ namespace { using ::testing::_; using ::testing::FloatEq; +using ::testing::NiceMock; using ::testing::Return; AudioDecodingCallStats MakeAudioDecodeStatsForTest() { @@ -86,7 +87,7 @@ struct ConfigHelper { config.audio_processing = use_null_audio_processing ? nullptr - : new rtc::RefCountedObject(); + : new rtc::RefCountedObject>(); config.audio_device_module = new rtc::RefCountedObject>(); audio_state_ = AudioState::Create(config); diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index b91296e212..f76a8fa255 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -48,6 +48,7 @@ using ::testing::Field; using ::testing::InSequence; using ::testing::Invoke; using ::testing::Ne; +using ::testing::NiceMock; using ::testing::Return; using ::testing::StrEq; @@ -153,7 +154,7 @@ struct ConfigHelper { audio_processing_( use_null_audio_processing ? nullptr - : new rtc::RefCountedObject()), + : new rtc::RefCountedObject>()), bitrate_allocator_(&limit_observer_), worker_queue_(task_queue_factory_->CreateTaskQueue( "ConfigHelper_worker_queue", diff --git a/audio/voip/test/voip_core_unittest.cc b/audio/voip/test/voip_core_unittest.cc index 8ab67b7360..f7a82f9018 100644 --- a/audio/voip/test/voip_core_unittest.cc +++ b/audio/voip/test/voip_core_unittest.cc @@ -39,7 +39,7 @@ class VoipCoreTest : public ::testing::Test { auto encoder_factory = CreateBuiltinAudioEncoderFactory(); auto decoder_factory = CreateBuiltinAudioDecoderFactory(); rtc::scoped_refptr audio_processing = - new rtc::RefCountedObject(); + new rtc::RefCountedObject>(); auto process_thread = std::make_unique>(); // Hold the pointer to use for testing. diff --git a/call/call_unittest.cc b/call/call_unittest.cc index e165107d98..b6be941e53 100644 --- a/call/call_unittest.cc +++ b/call/call_unittest.cc @@ -41,6 +41,7 @@ namespace { using ::testing::_; using ::testing::Contains; +using ::testing::NiceMock; using ::testing::StrictMock; struct CallHelper { @@ -52,7 +53,8 @@ struct CallHelper { audio_state_config.audio_processing = use_null_audio_processing ? nullptr - : new rtc::RefCountedObject(); + : new rtc::RefCountedObject< + NiceMock>(); audio_state_config.audio_device_module = new rtc::RefCountedObject(); webrtc::Call::Config config(&event_log_); diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h index 2055f7e511..db9ab975ff 100644 --- a/modules/audio_processing/include/mock_audio_processing.h +++ b/modules/audio_processing/include/mock_audio_processing.h @@ -67,7 +67,7 @@ class MockEchoControl : public EchoControl { MOCK_METHOD(bool, ActiveProcessing, (), (const, override)); }; -class MockAudioProcessing : public ::testing::NiceMock { +class MockAudioProcessing : public AudioProcessing { public: MockAudioProcessing() {}