From 87f7090fd962fa2245e848ba7949fd6a2de18655 Mon Sep 17 00:00:00 2001 From: Tommi Date: Tue, 27 Apr 2021 14:43:08 +0200 Subject: [PATCH] Replace more instances of rtc::RefCountedObject with make_ref_counted. This is essentially replacing `new rtc::RefCountedObject` with `rtc::make_ref_counted` in many files. In a couple of places I made minor tweaks to make things compile such as adding parenthesis when they were missing. Bug: webrtc:12701 Change-Id: I3828dbf3ee0eb0232f3a47067474484ac2f4aed2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215973 Reviewed-by: Danil Chapovalov Commit-Queue: Tommi Cr-Commit-Position: refs/heads/master@{#33852} --- .../neteq/decoder_database_unittest.cc | 17 ++++----- .../neteq/neteq_decoder_plc_unittest.cc | 2 +- .../audio_coding/neteq/neteq_impl_unittest.cc | 34 +++++++++--------- .../neteq/neteq_network_stats_unittest.cc | 2 +- .../neteq/red_payload_splitter_unittest.cc | 4 +-- .../neteq/tools/neteq_test_factory.cc | 2 +- .../audio_device_data_observer.cc | 20 +++++------ modules/audio_device/audio_device_impl.cc | 13 ++++--- .../audio_device/include/mock_audio_device.h | 5 ++- .../audio_device/include/test_audio_device.cc | 2 +- .../win/audio_device_module_win.cc | 2 +- modules/audio_mixer/audio_mixer_impl.cc | 5 ++- .../audio_processing/audio_processing_impl.cc | 3 +- .../audio_processing_impl_unittest.cc | 12 +++---- .../residual_echo_detector_unittest.cc | 12 +++---- modules/rtp_rtcp/source/rtp_sender_video.cc | 3 +- .../linux/video_capture_linux.cc | 3 +- .../windows/video_capture_factory_windows.cc | 3 +- .../multiplex/multiplex_decoder_adapter.cc | 5 ++- .../test/multiplex_adapter_unittest.cc | 6 ++-- .../video_codec_initializer_unittest.cc | 4 +-- pc/audio_rtp_receiver.cc | 4 +-- pc/audio_track.cc | 2 +- pc/dtls_transport.cc | 2 +- pc/dtls_transport_unittest.cc | 6 ++-- pc/dtmf_sender.cc | 4 +-- pc/ice_transport_unittest.cc | 5 ++- pc/jitter_buffer_delay_unittest.cc | 4 +-- pc/jsep_transport.cc | 19 +++++----- pc/jsep_transport_controller_unittest.cc | 2 +- pc/jsep_transport_unittest.cc | 3 +- pc/local_audio_source.cc | 3 +- pc/media_stream.cc | 4 +-- pc/peer_connection.cc | 7 ++-- ...r_connection_adaptation_integrationtest.cc | 4 +-- pc/peer_connection_crypto_unittest.cc | 2 +- pc/peer_connection_factory.cc | 3 +- pc/peer_connection_ice_unittest.cc | 8 ++--- pc/peer_connection_integrationtest.cc | 14 ++++---- pc/peer_connection_interface_unittest.cc | 20 +++++------ pc/peer_connection_rampup_tests.cc | 2 +- pc/peer_connection_rtp_unittest.cc | 2 +- pc/peer_connection_signaling_unittest.cc | 22 +++++------- pc/peer_connection_wrapper.cc | 9 ++--- pc/proxy_unittest.cc | 2 +- pc/rtc_stats_collector.cc | 3 +- pc/rtc_stats_integrationtest.cc | 4 +-- pc/rtp_sender.cc | 10 +++--- pc/scenario_tests/goog_cc_test.cc | 4 +-- pc/sctp_data_channel.cc | 5 ++- pc/sctp_transport_unittest.cc | 8 ++--- pc/stats_collector_unittest.cc | 35 ++++++++----------- pc/stream_collection.h | 8 ++--- pc/test/fake_audio_capture_module.cc | 3 +- pc/test/fake_video_track_source.h | 2 +- pc/test/integration_test_helpers.h | 26 ++++++-------- pc/test/mock_peer_connection_observers.h | 2 +- pc/test/peer_connection_test_wrapper.cc | 11 +++--- pc/test/rtc_stats_obtainer.h | 3 +- pc/track_media_info_map_unittest.cc | 6 ++-- pc/video_rtp_track_source_unittest.cc | 4 +-- pc/video_track.cc | 4 +-- pc/video_track_unittest.cc | 2 +- pc/webrtc_session_description_factory.cc | 3 +- .../rtc_event_log_visualizer/analyze_audio.cc | 2 +- rtc_tools/rtp_generator/rtp_generator.cc | 14 ++++---- rtc_tools/video_file_reader.cc | 7 ++-- sdk/android/native_api/video/video_source.cc | 4 +-- .../jni/audio_device/audio_device_module.cc | 2 +- sdk/android/src/jni/encoded_image.cc | 2 +- sdk/android/src/jni/pc/peer_connection.cc | 30 +++++++--------- sdk/android/src/jni/pc/video.cc | 5 ++- sdk/android/src/jni/video_frame.cc | 7 ++-- test/encoder_settings.cc | 2 +- test/fake_texture_frame.cc | 2 +- test/fuzzers/sdp_integration_fuzzer.cc | 8 ++--- test/mappable_native_buffer.cc | 31 ++++++++-------- test/mock_audio_decoder_factory.h | 4 +-- test/pc/e2e/media/media_helper.cc | 2 +- test/pc/e2e/stats_poller.cc | 2 +- test/scenario/video_stream.cc | 16 ++++----- 81 files changed, 255 insertions(+), 340 deletions(-) diff --git a/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc index c1b92b5375..33bee8d6f5 100644 --- a/modules/audio_coding/neteq/decoder_database_unittest.cc +++ b/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -27,15 +27,14 @@ using ::testing::Invoke; namespace webrtc { TEST(DecoderDatabase, CreateAndDestroy) { - DecoderDatabase db(new rtc::RefCountedObject, + DecoderDatabase db(rtc::make_ref_counted(), absl::nullopt); EXPECT_EQ(0, db.Size()); EXPECT_TRUE(db.Empty()); } TEST(DecoderDatabase, InsertAndRemove) { - rtc::scoped_refptr factory( - new rtc::RefCountedObject); + auto factory = rtc::make_ref_counted(); DecoderDatabase db(factory, absl::nullopt); const uint8_t kPayloadType = 0; const std::string kCodecName = "Robert\'); DROP TABLE Students;"; @@ -50,8 +49,7 @@ TEST(DecoderDatabase, InsertAndRemove) { } TEST(DecoderDatabase, InsertAndRemoveAll) { - rtc::scoped_refptr factory( - new rtc::RefCountedObject); + auto factory = rtc::make_ref_counted(); DecoderDatabase db(factory, absl::nullopt); const std::string kCodecName1 = "Robert\'); DROP TABLE Students;"; const std::string kCodecName2 = "https://xkcd.com/327/"; @@ -67,8 +65,7 @@ TEST(DecoderDatabase, InsertAndRemoveAll) { } TEST(DecoderDatabase, GetDecoderInfo) { - rtc::scoped_refptr factory( - new rtc::RefCountedObject); + auto factory = rtc::make_ref_counted(); auto* decoder = new MockAudioDecoder; EXPECT_CALL(*factory, MakeAudioDecoderMock(_, _, _)) .WillOnce(Invoke([decoder](const SdpAudioFormat& format, @@ -103,8 +100,7 @@ TEST(DecoderDatabase, GetDecoder) { } TEST(DecoderDatabase, TypeTests) { - rtc::scoped_refptr factory( - new rtc::RefCountedObject); + auto factory = rtc::make_ref_counted(); DecoderDatabase db(factory, absl::nullopt); const uint8_t kPayloadTypePcmU = 0; const uint8_t kPayloadTypeCng = 13; @@ -140,8 +136,7 @@ TEST(DecoderDatabase, TypeTests) { TEST(DecoderDatabase, CheckPayloadTypes) { constexpr int kNumPayloads = 10; - rtc::scoped_refptr factory( - new rtc::RefCountedObject); + auto factory = rtc::make_ref_counted(); DecoderDatabase db(factory, absl::nullopt); // Load a number of payloads into the database. Payload types are 0, 1, ..., // while the decoder type is the same for all payload types (this does not diff --git a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc index cb0a3d88f8..2b4ae7e63e 100644 --- a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc +++ b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc @@ -208,7 +208,7 @@ TestStatistics RunTest(int loss_cadence, NetEqTest neteq_test( config, /*decoder_factory=*/ - new rtc::RefCountedObject(&dec), + rtc::make_ref_counted(&dec), /*codecs=*/decoders, /*text_log=*/nullptr, /*neteq_factory=*/nullptr, /*input=*/std::move(lossy_input), std::move(output), callbacks); EXPECT_LE(kRunTimeMs, neteq_test.Run()); diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc index a073d82295..c2a2bee525 100644 --- a/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -303,8 +303,7 @@ TEST_F(NetEqImplTest, InsertPacket) { fake_packet.sequence_number = kFirstSequenceNumber; fake_packet.timestamp = kFirstTimestamp; - rtc::scoped_refptr mock_decoder_factory( - new rtc::RefCountedObject); + auto mock_decoder_factory = rtc::make_ref_counted(); EXPECT_CALL(*mock_decoder_factory, MakeAudioDecoderMock(_, _, _)) .WillOnce(Invoke([&](const SdpAudioFormat& format, absl::optional codec_pair_id, @@ -487,8 +486,8 @@ TEST_F(NetEqImplTest, VerifyTimestampPropagation) { int16_t next_value_; } decoder_; - rtc::scoped_refptr decoder_factory = - new rtc::RefCountedObject(&decoder_); + auto decoder_factory = + rtc::make_ref_counted(&decoder_); UseNoMocks(); CreateInstance(decoder_factory); @@ -555,7 +554,7 @@ TEST_F(NetEqImplTest, ReorderedPacket) { MockAudioDecoder mock_decoder; CreateInstance( - new rtc::RefCountedObject(&mock_decoder)); + rtc::make_ref_counted(&mock_decoder)); const uint8_t kPayloadType = 17; // Just an arbitrary number. const int kSampleRateHz = 8000; @@ -927,7 +926,7 @@ TEST_F(NetEqImplTest, CodecInternalCng) { // Create a mock decoder object. MockAudioDecoder mock_decoder; CreateInstance( - new rtc::RefCountedObject(&mock_decoder)); + rtc::make_ref_counted(&mock_decoder)); const uint8_t kPayloadType = 17; // Just an arbitrary number. const int kSampleRateKhz = 48; @@ -1066,7 +1065,7 @@ TEST_F(NetEqImplTest, UnsupportedDecoder) { ::testing::NiceMock decoder; CreateInstance( - new rtc::RefCountedObject(&decoder)); + rtc::make_ref_counted(&decoder)); static const size_t kNetEqMaxFrameSize = 5760; // 120 ms @ 48 kHz. static const size_t kChannels = 2; @@ -1193,7 +1192,7 @@ TEST_F(NetEqImplTest, DecodedPayloadTooShort) { MockAudioDecoder mock_decoder; CreateInstance( - new rtc::RefCountedObject(&mock_decoder)); + rtc::make_ref_counted(&mock_decoder)); const uint8_t kPayloadType = 17; // Just an arbitrary number. const int kSampleRateHz = 8000; @@ -1252,7 +1251,7 @@ TEST_F(NetEqImplTest, DecodingError) { MockAudioDecoder mock_decoder; CreateInstance( - new rtc::RefCountedObject(&mock_decoder)); + rtc::make_ref_counted(&mock_decoder)); const uint8_t kPayloadType = 17; // Just an arbitrary number. const int kSampleRateHz = 8000; @@ -1364,7 +1363,7 @@ TEST_F(NetEqImplTest, DecodingErrorDuringInternalCng) { // Create a mock decoder object. MockAudioDecoder mock_decoder; CreateInstance( - new rtc::RefCountedObject(&mock_decoder)); + rtc::make_ref_counted(&mock_decoder)); const uint8_t kPayloadType = 17; // Just an arbitrary number. const int kSampleRateHz = 8000; @@ -1658,14 +1657,13 @@ class NetEqImplTest120ms : public NetEqImplTest { void Register120msCodec(AudioDecoder::SpeechType speech_type) { const uint32_t sampling_freq = kSamplingFreq_; - decoder_factory_ = - new rtc::RefCountedObject( - [sampling_freq, speech_type]() { - std::unique_ptr decoder = - std::make_unique(sampling_freq, speech_type); - RTC_CHECK_EQ(2, decoder->Channels()); - return decoder; - }); + decoder_factory_ = rtc::make_ref_counted( + [sampling_freq, speech_type]() { + std::unique_ptr decoder = + std::make_unique(sampling_freq, speech_type); + RTC_CHECK_EQ(2, decoder->Channels()); + return decoder; + }); } rtc::scoped_refptr decoder_factory_; diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc index 5f15babbe3..8f72734d23 100644 --- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc +++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc @@ -162,7 +162,7 @@ class NetEqNetworkStatsTest { NetEqNetworkStatsTest(const SdpAudioFormat& format, MockAudioDecoder* decoder) : decoder_(decoder), decoder_factory_( - new rtc::RefCountedObject(decoder)), + rtc::make_ref_counted(decoder)), samples_per_ms_(format.clockrate_hz / 1000), frame_size_samples_(kFrameSizeMs * samples_per_ms_), rtp_generator_(new RtpGenerator(samples_per_ms_)), diff --git a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc index 5956971b33..1cf616748f 100644 --- a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc +++ b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc @@ -298,7 +298,7 @@ TEST(RedPayloadSplitter, CheckRedPayloads) { // easier to just register the payload types and let the actual implementation // do its job. DecoderDatabase decoder_database( - new rtc::RefCountedObject, absl::nullopt); + rtc::make_ref_counted(), absl::nullopt); decoder_database.RegisterPayload(0, SdpAudioFormat("cn", 8000, 1)); decoder_database.RegisterPayload(1, SdpAudioFormat("pcmu", 8000, 1)); decoder_database.RegisterPayload(2, @@ -333,7 +333,7 @@ TEST(RedPayloadSplitter, CheckRedPayloadsRecursiveRed) { // easier to just register the payload types and let the actual implementation // do its job. DecoderDatabase decoder_database( - new rtc::RefCountedObject, absl::nullopt); + rtc::make_ref_counted(), absl::nullopt); decoder_database.RegisterPayload(kRedPayloadType, SdpAudioFormat("red", 8000, 1)); diff --git a/modules/audio_coding/neteq/tools/neteq_test_factory.cc b/modules/audio_coding/neteq/tools/neteq_test_factory.cc index f8ec36bd25..1a0ea156f1 100644 --- a/modules/audio_coding/neteq/tools/neteq_test_factory.cc +++ b/modules/audio_coding/neteq/tools/neteq_test_factory.cc @@ -285,7 +285,7 @@ std::unique_ptr NetEqTestFactory::InitializeTest( // Note that capture-by-copy implies that the lambda captures the value of // decoder_factory before it's reassigned on the left-hand side. - decoder_factory = new rtc::RefCountedObject( + decoder_factory = rtc::make_ref_counted( [decoder_factory, config]( const SdpAudioFormat& format, absl::optional codec_pair_id) { diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 89265a288f..be78fd16d7 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -301,9 +301,8 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport { rtc::scoped_refptr CreateAudioDeviceWithDataObserver( rtc::scoped_refptr impl, std::unique_ptr observer) { - rtc::scoped_refptr audio_device( - new rtc::RefCountedObject(impl, observer.get(), - std::move(observer))); + auto audio_device = rtc::make_ref_counted(impl, observer.get(), + std::move(observer)); if (!audio_device->IsValid()) { return nullptr; @@ -315,8 +314,8 @@ rtc::scoped_refptr CreateAudioDeviceWithDataObserver( rtc::scoped_refptr CreateAudioDeviceWithDataObserver( rtc::scoped_refptr impl, AudioDeviceDataObserver* legacy_observer) { - rtc::scoped_refptr audio_device( - new rtc::RefCountedObject(impl, legacy_observer, nullptr)); + auto audio_device = + rtc::make_ref_counted(impl, legacy_observer, nullptr); if (!audio_device->IsValid()) { return nullptr; @@ -329,10 +328,8 @@ rtc::scoped_refptr CreateAudioDeviceWithDataObserver( AudioDeviceModule::AudioLayer audio_layer, TaskQueueFactory* task_queue_factory, std::unique_ptr observer) { - rtc::scoped_refptr audio_device( - new rtc::RefCountedObject(audio_layer, task_queue_factory, - observer.get(), - std::move(observer))); + auto audio_device = rtc::make_ref_counted( + audio_layer, task_queue_factory, observer.get(), std::move(observer)); if (!audio_device->IsValid()) { return nullptr; @@ -345,9 +342,8 @@ rtc::scoped_refptr CreateAudioDeviceWithDataObserver( AudioDeviceModule::AudioLayer audio_layer, TaskQueueFactory* task_queue_factory, AudioDeviceDataObserver* legacy_observer) { - rtc::scoped_refptr audio_device( - new rtc::RefCountedObject(audio_layer, task_queue_factory, - legacy_observer, nullptr)); + auto audio_device = rtc::make_ref_counted( + audio_layer, task_queue_factory, legacy_observer, nullptr); if (!audio_device->IsValid()) { return nullptr; diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index 0e8bd28c50..84460ff83f 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -92,27 +92,26 @@ rtc::scoped_refptr AudioDeviceModule::CreateForTest( } // Create the generic reference counted (platform independent) implementation. - rtc::scoped_refptr audioDevice( - new rtc::RefCountedObject(audio_layer, - task_queue_factory)); + auto audio_device = rtc::make_ref_counted( + audio_layer, task_queue_factory); // Ensure that the current platform is supported. - if (audioDevice->CheckPlatform() == -1) { + if (audio_device->CheckPlatform() == -1) { return nullptr; } // Create the platform-dependent implementation. - if (audioDevice->CreatePlatformSpecificObjects() == -1) { + if (audio_device->CreatePlatformSpecificObjects() == -1) { return nullptr; } // Ensure that the generic audio buffer can communicate with the platform // specific parts. - if (audioDevice->AttachAudioBuffer() == -1) { + if (audio_device->AttachAudioBuffer() == -1) { return nullptr; } - return audioDevice; + return audio_device; } AudioDeviceModuleImpl::AudioDeviceModuleImpl( diff --git a/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h index 0ca19de156..8483aa3da8 100644 --- a/modules/audio_device/include/mock_audio_device.h +++ b/modules/audio_device/include/mock_audio_device.h @@ -23,11 +23,10 @@ namespace test { class MockAudioDeviceModule : public AudioDeviceModule { public: static rtc::scoped_refptr CreateNice() { - return new rtc::RefCountedObject< - ::testing::NiceMock>(); + return rtc::make_ref_counted<::testing::NiceMock>(); } static rtc::scoped_refptr CreateStrict() { - return new rtc::RefCountedObject< + return rtc::make_ref_counted< ::testing::StrictMock>(); } diff --git a/modules/audio_device/include/test_audio_device.cc b/modules/audio_device/include/test_audio_device.cc index 46bf216540..8351e8a405 100644 --- a/modules/audio_device/include/test_audio_device.cc +++ b/modules/audio_device/include/test_audio_device.cc @@ -447,7 +447,7 @@ rtc::scoped_refptr TestAudioDeviceModule::Create( std::unique_ptr capturer, std::unique_ptr renderer, float speed) { - return new rtc::RefCountedObject( + return rtc::make_ref_counted( task_queue_factory, std::move(capturer), std::move(renderer), speed); } diff --git a/modules/audio_device/win/audio_device_module_win.cc b/modules/audio_device/win/audio_device_module_win.cc index 9c10e71e47..8cc4b7fc36 100644 --- a/modules/audio_device/win/audio_device_module_win.cc +++ b/modules/audio_device/win/audio_device_module_win.cc @@ -514,7 +514,7 @@ CreateWindowsCoreAudioAudioDeviceModuleFromInputAndOutput( std::unique_ptr audio_output, TaskQueueFactory* task_queue_factory) { RTC_DLOG(INFO) << __FUNCTION__; - return new rtc::RefCountedObject( + return rtc::make_ref_counted( std::move(audio_input), std::move(audio_output), task_queue_factory); } diff --git a/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc index 04a8bcf723..925cee5092 100644 --- a/modules/audio_mixer/audio_mixer_impl.cc +++ b/modules/audio_mixer/audio_mixer_impl.cc @@ -147,9 +147,8 @@ rtc::scoped_refptr AudioMixerImpl::Create() { rtc::scoped_refptr AudioMixerImpl::Create( std::unique_ptr output_rate_calculator, bool use_limiter) { - return rtc::scoped_refptr( - new rtc::RefCountedObject( - std::move(output_rate_calculator), use_limiter)); + return rtc::make_ref_counted( + std::move(output_rate_calculator), use_limiter); } void AudioMixerImpl::Mix(size_t number_of_channels, diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 12646fd243..842fd8844b 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -290,8 +290,7 @@ AudioProcessingImpl::AudioProcessingImpl( // If no echo detector is injected, use the ResidualEchoDetector. if (!submodules_.echo_detector) { - submodules_.echo_detector = - new rtc::RefCountedObject(); + submodules_.echo_detector = rtc::make_ref_counted(); } #if !(defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)) diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc index ef1830357a..ca8b8b4c25 100644 --- a/modules/audio_processing/audio_processing_impl_unittest.cc +++ b/modules/audio_processing/audio_processing_impl_unittest.cc @@ -544,8 +544,7 @@ TEST(AudioProcessingImplTest, EchoControllerObservesPlayoutVolumeChange) { TEST(AudioProcessingImplTest, RenderPreProcessorBeforeEchoDetector) { // Make sure that signal changes caused by a render pre-processing sub-module // take place before any echo detector analysis. - rtc::scoped_refptr test_echo_detector( - new rtc::RefCountedObject()); + auto test_echo_detector = rtc::make_ref_counted(); std::unique_ptr test_render_pre_processor( new TestRenderPreProcessor()); // Create APM injecting the test echo detector and render pre-processor. @@ -605,8 +604,7 @@ TEST(AudioProcessingImplTest, RenderPreProcessorBeforeEchoDetector) { // config should be bit-exact with running APM with said submodules disabled. // This mainly tests that SetCreateOptionalSubmodulesForTesting has an effect. TEST(ApmWithSubmodulesExcludedTest, BitexactWithDisabledModules) { - rtc::scoped_refptr apm = - new rtc::RefCountedObject(webrtc::Config()); + auto apm = rtc::make_ref_counted(webrtc::Config()); ASSERT_EQ(apm->Initialize(), AudioProcessing::kNoError); ApmSubmoduleCreationOverrides overrides; @@ -654,8 +652,7 @@ TEST(ApmWithSubmodulesExcludedTest, BitexactWithDisabledModules) { // Disable transient suppressor creation and run APM in ways that should trigger // calls to the transient suppressor API. TEST(ApmWithSubmodulesExcludedTest, ReinitializeTransientSuppressor) { - rtc::scoped_refptr apm = - new rtc::RefCountedObject(webrtc::Config()); + auto apm = rtc::make_ref_counted(webrtc::Config()); ASSERT_EQ(apm->Initialize(), kNoErr); ApmSubmoduleCreationOverrides overrides; @@ -716,8 +713,7 @@ TEST(ApmWithSubmodulesExcludedTest, ReinitializeTransientSuppressor) { // Disable transient suppressor creation and run APM in ways that should trigger // calls to the transient suppressor API. TEST(ApmWithSubmodulesExcludedTest, ToggleTransientSuppressor) { - rtc::scoped_refptr apm = - new rtc::RefCountedObject(webrtc::Config()); + auto apm = rtc::make_ref_counted(webrtc::Config()); ASSERT_EQ(apm->Initialize(), AudioProcessing::kNoError); ApmSubmoduleCreationOverrides overrides; diff --git a/modules/audio_processing/residual_echo_detector_unittest.cc b/modules/audio_processing/residual_echo_detector_unittest.cc index 6697cf009d..a5f1409516 100644 --- a/modules/audio_processing/residual_echo_detector_unittest.cc +++ b/modules/audio_processing/residual_echo_detector_unittest.cc @@ -18,8 +18,7 @@ namespace webrtc { TEST(ResidualEchoDetectorTests, Echo) { - rtc::scoped_refptr echo_detector = - new rtc::RefCountedObject(); + auto echo_detector = rtc::make_ref_counted(); echo_detector->SetReliabilityForTest(1.0f); std::vector ones(160, 1.f); std::vector zeros(160, 0.f); @@ -46,8 +45,7 @@ TEST(ResidualEchoDetectorTests, Echo) { } TEST(ResidualEchoDetectorTests, NoEcho) { - rtc::scoped_refptr echo_detector = - new rtc::RefCountedObject(); + auto echo_detector = rtc::make_ref_counted(); echo_detector->SetReliabilityForTest(1.0f); std::vector ones(160, 1.f); std::vector zeros(160, 0.f); @@ -69,8 +67,7 @@ TEST(ResidualEchoDetectorTests, NoEcho) { } TEST(ResidualEchoDetectorTests, EchoWithRenderClockDrift) { - rtc::scoped_refptr echo_detector = - new rtc::RefCountedObject(); + auto echo_detector = rtc::make_ref_counted(); echo_detector->SetReliabilityForTest(1.0f); std::vector ones(160, 1.f); std::vector zeros(160, 0.f); @@ -107,8 +104,7 @@ TEST(ResidualEchoDetectorTests, EchoWithRenderClockDrift) { } TEST(ResidualEchoDetectorTests, EchoWithCaptureClockDrift) { - rtc::scoped_refptr echo_detector = - new rtc::RefCountedObject(); + auto echo_detector = rtc::make_ref_counted(); echo_detector->SetReliabilityForTest(1.0f); std::vector ones(160, 1.f); std::vector zeros(160, 0.f); diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index 3b992dc4eb..6e620777c6 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -169,8 +169,7 @@ RTPSenderVideo::RTPSenderVideo(const Config& config) absolute_capture_time_sender_(config.clock), frame_transformer_delegate_( config.frame_transformer - ? new rtc::RefCountedObject< - RTPSenderVideoFrameTransformerDelegate>( + ? rtc::make_ref_counted( this, config.frame_transformer, rtp_sender_->SSRC(), diff --git a/modules/video_capture/linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc index bffb67c82a..49237cdf19 100644 --- a/modules/video_capture/linux/video_capture_linux.cc +++ b/modules/video_capture/linux/video_capture_linux.cc @@ -34,8 +34,7 @@ namespace webrtc { namespace videocapturemodule { rtc::scoped_refptr VideoCaptureImpl::Create( const char* deviceUniqueId) { - rtc::scoped_refptr implementation( - new rtc::RefCountedObject()); + auto implementation = rtc::make_ref_counted(); if (implementation->Init(deviceUniqueId) != 0) return nullptr; diff --git a/modules/video_capture/windows/video_capture_factory_windows.cc b/modules/video_capture/windows/video_capture_factory_windows.cc index ea9d31add9..34cc982d7e 100644 --- a/modules/video_capture/windows/video_capture_factory_windows.cc +++ b/modules/video_capture/windows/video_capture_factory_windows.cc @@ -27,8 +27,7 @@ rtc::scoped_refptr VideoCaptureImpl::Create( return nullptr; // TODO(tommi): Use Media Foundation implementation for Vista and up. - rtc::scoped_refptr capture( - new rtc::RefCountedObject()); + auto capture = rtc::make_ref_counted(); if (capture->Init(device_id) != 0) { return nullptr; } diff --git a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc index 8d23c6d858..2332fcddfb 100644 --- a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc +++ b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc @@ -248,9 +248,8 @@ void MultiplexDecoderAdapter::MergeAlphaImages( [yuv_buffer, alpha_buffer] {}); } if (supports_augmenting_data_) { - merged_buffer = rtc::scoped_refptr( - new rtc::RefCountedObject( - merged_buffer, std::move(augmenting_data), augmenting_data_length)); + merged_buffer = rtc::make_ref_counted( + merged_buffer, std::move(augmenting_data), augmenting_data_length); } VideoFrame merged_image = VideoFrame::Builder() diff --git a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc index 2e7b0cb3c0..7ecb24a87c 100644 --- a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc +++ b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc @@ -90,9 +90,9 @@ class TestMultiplexAdapter : public VideoCodecUnitTest, for (int i = 0; i < 16; i++) { data[i] = i; } - rtc::scoped_refptr augmented_video_frame_buffer = - new rtc::RefCountedObject( - video_buffer, std::move(data), 16); + auto augmented_video_frame_buffer = + rtc::make_ref_counted(video_buffer, + std::move(data), 16); return std::make_unique( VideoFrame::Builder() .set_video_frame_buffer(augmented_video_frame_buffer) diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc index 1ea145e14f..f7fde8d873 100644 --- a/modules/video_coding/video_codec_initializer_unittest.cc +++ b/modules/video_coding/video_codec_initializer_unittest.cc @@ -74,13 +74,13 @@ class VideoCodecInitializerTest : public ::testing::Test { config_.number_of_streams = num_spatial_streams; VideoCodecVP8 vp8_settings = VideoEncoder::GetDefaultVp8Settings(); vp8_settings.numberOfTemporalLayers = num_temporal_streams; - config_.encoder_specific_settings = new rtc::RefCountedObject< + config_.encoder_specific_settings = rtc::make_ref_counted< webrtc::VideoEncoderConfig::Vp8EncoderSpecificSettings>(vp8_settings); } else if (type == VideoCodecType::kVideoCodecVP9) { VideoCodecVP9 vp9_settings = VideoEncoder::GetDefaultVp9Settings(); vp9_settings.numberOfSpatialLayers = num_spatial_streams; vp9_settings.numberOfTemporalLayers = num_temporal_streams; - config_.encoder_specific_settings = new rtc::RefCountedObject< + config_.encoder_specific_settings = rtc::make_ref_counted< webrtc::VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings); } else if (type != VideoCodecType::kVideoCodecMultiplex) { ADD_FAILURE() << "Unexpected codec type: " << type; diff --git a/pc/audio_rtp_receiver.cc b/pc/audio_rtp_receiver.cc index 48553ba9f5..382b5a0fa1 100644 --- a/pc/audio_rtp_receiver.cc +++ b/pc/audio_rtp_receiver.cc @@ -42,7 +42,7 @@ AudioRtpReceiver::AudioRtpReceiver( bool is_unified_plan) : worker_thread_(worker_thread), id_(receiver_id), - source_(new rtc::RefCountedObject( + source_(rtc::make_ref_counted( worker_thread, is_unified_plan ? RemoteAudioSource::OnAudioChannelGoneAction::kSurvive @@ -55,7 +55,7 @@ AudioRtpReceiver::AudioRtpReceiver( delay_(JitterBufferDelayProxy::Create( rtc::Thread::Current(), worker_thread_, - new rtc::RefCountedObject(worker_thread))) { + rtc::make_ref_counted(worker_thread))) { RTC_DCHECK(worker_thread_); RTC_DCHECK(track_->GetSource()->remote()); track_->RegisterObserver(this); diff --git a/pc/audio_track.cc b/pc/audio_track.cc index 4f4c6b4757..191d4efbc4 100644 --- a/pc/audio_track.cc +++ b/pc/audio_track.cc @@ -19,7 +19,7 @@ namespace webrtc { rtc::scoped_refptr AudioTrack::Create( const std::string& id, const rtc::scoped_refptr& source) { - return new rtc::RefCountedObject(id, source); + return rtc::make_ref_counted(id, source); } AudioTrack::AudioTrack(const std::string& label, diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc index 0b6d367184..1369db1f54 100644 --- a/pc/dtls_transport.cc +++ b/pc/dtls_transport.cc @@ -48,7 +48,7 @@ DtlsTransport::DtlsTransport( : owner_thread_(rtc::Thread::Current()), info_(DtlsTransportState::kNew), internal_dtls_transport_(std::move(internal)), - ice_transport_(new rtc::RefCountedObject( + ice_transport_(rtc::make_ref_counted( internal_dtls_transport_->ice_transport())) { RTC_DCHECK(internal_dtls_transport_.get()); internal_dtls_transport_->SubscribeDtlsState( diff --git a/pc/dtls_transport_unittest.cc b/pc/dtls_transport_unittest.cc index a3f0a7ce8b..f80d99b05e 100644 --- a/pc/dtls_transport_unittest.cc +++ b/pc/dtls_transport_unittest.cc @@ -63,7 +63,7 @@ class DtlsTransportTest : public ::testing::Test { } cricket_transport->SetSslCipherSuite(kNonsenseCipherSuite); transport_ = - new rtc::RefCountedObject(std::move(cricket_transport)); + rtc::make_ref_counted(std::move(cricket_transport)); } void CompleteDtlsHandshake() { @@ -86,8 +86,8 @@ class DtlsTransportTest : public ::testing::Test { TEST_F(DtlsTransportTest, CreateClearDelete) { auto cricket_transport = std::make_unique( "audio", cricket::ICE_CANDIDATE_COMPONENT_RTP); - rtc::scoped_refptr webrtc_transport = - new rtc::RefCountedObject(std::move(cricket_transport)); + auto webrtc_transport = + rtc::make_ref_counted(std::move(cricket_transport)); ASSERT_TRUE(webrtc_transport->internal()); ASSERT_EQ(DtlsTransportState::kNew, webrtc_transport->Information().state()); webrtc_transport->Clear(); diff --git a/pc/dtmf_sender.cc b/pc/dtmf_sender.cc index 5af05c8964..67c3fac134 100644 --- a/pc/dtmf_sender.cc +++ b/pc/dtmf_sender.cc @@ -65,9 +65,7 @@ rtc::scoped_refptr DtmfSender::Create( if (!signaling_thread) { return nullptr; } - rtc::scoped_refptr dtmf_sender( - new rtc::RefCountedObject(signaling_thread, provider)); - return dtmf_sender; + return rtc::make_ref_counted(signaling_thread, provider); } DtmfSender::DtmfSender(rtc::Thread* signaling_thread, diff --git a/pc/ice_transport_unittest.cc b/pc/ice_transport_unittest.cc index 3711a86d5d..ebb46cb5d5 100644 --- a/pc/ice_transport_unittest.cc +++ b/pc/ice_transport_unittest.cc @@ -28,9 +28,8 @@ class IceTransportTest : public ::testing::Test {}; TEST_F(IceTransportTest, CreateNonSelfDeletingTransport) { auto cricket_transport = std::make_unique("name", 0, nullptr); - rtc::scoped_refptr ice_transport = - new rtc::RefCountedObject( - cricket_transport.get()); + auto ice_transport = + rtc::make_ref_counted(cricket_transport.get()); EXPECT_EQ(ice_transport->internal(), cricket_transport.get()); ice_transport->Clear(); EXPECT_NE(ice_transport->internal(), cricket_transport.get()); diff --git a/pc/jitter_buffer_delay_unittest.cc b/pc/jitter_buffer_delay_unittest.cc index 7edd09acd2..61adb2d2bc 100644 --- a/pc/jitter_buffer_delay_unittest.cc +++ b/pc/jitter_buffer_delay_unittest.cc @@ -31,8 +31,8 @@ namespace webrtc { class JitterBufferDelayTest : public ::testing::Test { public: JitterBufferDelayTest() - : delay_(new rtc::RefCountedObject( - rtc::Thread::Current())) {} + : delay_( + rtc::make_ref_counted(rtc::Thread::Current())) {} protected: rtc::scoped_refptr delay_; diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc index 1bdcafd7ec..dc4649bf11 100644 --- a/pc/jsep_transport.cc +++ b/pc/jsep_transport.cc @@ -88,21 +88,20 @@ JsepTransport::JsepTransport( unencrypted_rtp_transport_(std::move(unencrypted_rtp_transport)), sdes_transport_(std::move(sdes_transport)), dtls_srtp_transport_(std::move(dtls_srtp_transport)), - rtp_dtls_transport_( - rtp_dtls_transport ? new rtc::RefCountedObject( - std::move(rtp_dtls_transport)) - : nullptr), - rtcp_dtls_transport_( - rtcp_dtls_transport - ? new rtc::RefCountedObject( - std::move(rtcp_dtls_transport)) - : nullptr), + rtp_dtls_transport_(rtp_dtls_transport + ? rtc::make_ref_counted( + std::move(rtp_dtls_transport)) + : nullptr), + rtcp_dtls_transport_(rtcp_dtls_transport + ? rtc::make_ref_counted( + std::move(rtcp_dtls_transport)) + : nullptr), sctp_data_channel_transport_( sctp_transport ? std::make_unique( sctp_transport.get()) : nullptr), sctp_transport_(sctp_transport - ? new rtc::RefCountedObject( + ? rtc::make_ref_counted( std::move(sctp_transport)) : nullptr) { RTC_DCHECK(ice_transport_); diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc index 5c621fdee3..d13a94cb29 100644 --- a/pc/jsep_transport_controller_unittest.cc +++ b/pc/jsep_transport_controller_unittest.cc @@ -50,7 +50,7 @@ class FakeIceTransportFactory : public webrtc::IceTransportFactory { const std::string& transport_name, int component, IceTransportInit init) override { - return new rtc::RefCountedObject( + return rtc::make_ref_counted( std::make_unique(transport_name, component)); } }; diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc index 4dd2b5ce67..5f4334068a 100644 --- a/pc/jsep_transport_unittest.cc +++ b/pc/jsep_transport_unittest.cc @@ -48,8 +48,7 @@ rtc::scoped_refptr CreateIceTransport( return nullptr; } - return new rtc::RefCountedObject( - std::move(internal)); + return rtc::make_ref_counted(std::move(internal)); } class JsepTransport2Test : public ::testing::Test, public sigslot::has_slots<> { diff --git a/pc/local_audio_source.cc b/pc/local_audio_source.cc index 22ab1c39c3..3fcad50a1d 100644 --- a/pc/local_audio_source.cc +++ b/pc/local_audio_source.cc @@ -18,8 +18,7 @@ namespace webrtc { rtc::scoped_refptr LocalAudioSource::Create( const cricket::AudioOptions* audio_options) { - rtc::scoped_refptr source( - new rtc::RefCountedObject()); + auto source = rtc::make_ref_counted(); source->Initialize(audio_options); return source; } diff --git a/pc/media_stream.cc b/pc/media_stream.cc index 00f491b3cb..08a2a723d0 100644 --- a/pc/media_stream.cc +++ b/pc/media_stream.cc @@ -31,9 +31,7 @@ static typename V::iterator FindTrack(V* vector, const std::string& track_id) { } rtc::scoped_refptr MediaStream::Create(const std::string& id) { - rtc::RefCountedObject* stream = - new rtc::RefCountedObject(id); - return stream; + return rtc::make_ref_counted(id); } MediaStream::MediaStream(const std::string& id) : id_(id) {} diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc index 7177764f29..1efb0ab20a 100644 --- a/pc/peer_connection.cc +++ b/pc/peer_connection.cc @@ -465,10 +465,9 @@ RTCErrorOr> PeerConnection::Create( } // The PeerConnection constructor consumes some, but not all, dependencies. - rtc::scoped_refptr pc( - new rtc::RefCountedObject( - context, options, is_unified_plan, std::move(event_log), - std::move(call), dependencies, dtls_enabled)); + auto pc = rtc::make_ref_counted( + context, options, is_unified_plan, std::move(event_log), std::move(call), + dependencies, dtls_enabled); RTCError init_error = pc->Initialize(configuration, std::move(dependencies)); if (!init_error.ok()) { RTC_LOG(LS_ERROR) << "PeerConnection initialization failed"; diff --git a/pc/peer_connection_adaptation_integrationtest.cc b/pc/peer_connection_adaptation_integrationtest.cc index 71d054eb90..dfb12971b4 100644 --- a/pc/peer_connection_adaptation_integrationtest.cc +++ b/pc/peer_connection_adaptation_integrationtest.cc @@ -50,7 +50,7 @@ TrackWithPeriodicSource CreateTrackWithPeriodicSource( periodic_track_source_config.frame_interval_ms = 100; periodic_track_source_config.timestamp_offset_ms = rtc::TimeMillis(); rtc::scoped_refptr periodic_track_source = - new rtc::RefCountedObject( + rtc::make_ref_counted( periodic_track_source_config, /* remote */ false); TrackWithPeriodicSource track_with_source; track_with_source.track = @@ -83,7 +83,7 @@ class PeerConnectionAdaptationIntegrationTest : public ::testing::Test { rtc::scoped_refptr CreatePcWrapper( const char* name) { rtc::scoped_refptr pc_wrapper = - new rtc::RefCountedObject( + rtc::make_ref_counted( name, network_thread_.get(), worker_thread_.get()); PeerConnectionInterface::RTCConfiguration config; config.sdp_semantics = SdpSemantics::kUnifiedPlan; diff --git a/pc/peer_connection_crypto_unittest.cc b/pc/peer_connection_crypto_unittest.cc index 32e8cbd74c..394203cb02 100644 --- a/pc/peer_connection_crypto_unittest.cc +++ b/pc/peer_connection_crypto_unittest.cc @@ -631,7 +631,7 @@ TEST_P(PeerConnectionCryptoDtlsCertGenTest, TestCertificateGeneration) { observers; for (size_t i = 0; i < concurrent_calls_; i++) { rtc::scoped_refptr observer = - new rtc::RefCountedObject(); + rtc::make_ref_counted(); observers.push_back(observer); if (sdp_type_ == SdpType::kOffer) { pc->pc()->CreateOffer(observer, diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc index c911871f8d..515494de1b 100644 --- a/pc/peer_connection_factory.cc +++ b/pc/peer_connection_factory.cc @@ -84,8 +84,7 @@ rtc::scoped_refptr PeerConnectionFactory::Create( if (!context) { return nullptr; } - return new rtc::RefCountedObject(context, - &dependencies); + return rtc::make_ref_counted(context, &dependencies); } PeerConnectionFactory::PeerConnectionFactory( diff --git a/pc/peer_connection_ice_unittest.cc b/pc/peer_connection_ice_unittest.cc index b9b8966447..ed30377f20 100644 --- a/pc/peer_connection_ice_unittest.cc +++ b/pc/peer_connection_ice_unittest.cc @@ -768,8 +768,8 @@ TEST_P(PeerConnectionIceTest, ASSERT_TRUE(callee->SetRemoteDescription(caller->CreateOfferAndSetAsLocal())); // Chain an operation that will block AddIceCandidate() from executing. - rtc::scoped_refptr answer_observer( - new rtc::RefCountedObject()); + auto answer_observer = + rtc::make_ref_counted(); callee->pc()->CreateAnswer(answer_observer, RTCOfferAnswerOptions()); auto jsep_candidate = @@ -816,8 +816,8 @@ TEST_P(PeerConnectionIceTest, ASSERT_TRUE(callee->SetRemoteDescription(caller->CreateOfferAndSetAsLocal())); // Chain an operation that will block AddIceCandidate() from executing. - rtc::scoped_refptr answer_observer( - new rtc::RefCountedObject()); + auto answer_observer = + rtc::make_ref_counted(); callee->pc()->CreateAnswer(answer_observer, RTCOfferAnswerOptions()); auto jsep_candidate = diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc index b2401022c4..dfceacd777 100644 --- a/pc/peer_connection_integrationtest.cc +++ b/pc/peer_connection_integrationtest.cc @@ -2833,8 +2833,7 @@ TEST_P(PeerConnectionIntegrationTest, IceTransportFactoryUsedForConnections) { /*reset_decoder_factory=*/false); ASSERT_TRUE(wrapper); wrapper->CreateDataChannel(); - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); wrapper->pc()->SetLocalDescription(observer, wrapper->CreateOfferAndWait().release()); } @@ -3319,8 +3318,7 @@ TEST_F(PeerConnectionIntegrationTestUnifiedPlan, SetSignalIceCandidates(false); // Workaround candidate outrace sdp. caller()->AddVideoTrack(); callee()->AddVideoTrack(); - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); callee()->pc()->SetLocalDescription(observer, callee()->CreateOfferAndWait().release()); EXPECT_TRUE_WAIT(observer->called(), kDefaultTimeout); @@ -3337,15 +3335,15 @@ TEST_F(PeerConnectionIntegrationTestUnifiedPlan, ASSERT_TRUE(CreatePeerConnectionWrappersWithConfig(config, config)); - rtc::scoped_refptr sld_observer( - new rtc::RefCountedObject()); + auto sld_observer = + rtc::make_ref_counted(); callee()->pc()->SetLocalDescription(sld_observer, callee()->CreateOfferAndWait().release()); EXPECT_TRUE_WAIT(sld_observer->called(), kDefaultTimeout); EXPECT_EQ(sld_observer->error(), ""); - rtc::scoped_refptr srd_observer( - new rtc::RefCountedObject()); + auto srd_observer = + rtc::make_ref_counted(); callee()->pc()->SetRemoteDescription( srd_observer, caller()->CreateOfferAndWait().release()); EXPECT_TRUE_WAIT(srd_observer->called(), kDefaultTimeout); diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc index d454dd2a05..fcea842b22 100644 --- a/pc/peer_connection_interface_unittest.cc +++ b/pc/peer_connection_interface_unittest.cc @@ -661,7 +661,7 @@ class PeerConnectionFactoryForTest : public webrtc::PeerConnectionFactory { dependencies.event_log_factory = std::make_unique( dependencies.task_queue_factory.get()); - return new rtc::RefCountedObject( + return rtc::make_ref_counted( std::move(dependencies)); } @@ -879,8 +879,8 @@ class PeerConnectionInterfaceBaseTest : public ::testing::Test { bool DoCreateOfferAnswer(std::unique_ptr* desc, const RTCOfferAnswerOptions* options, bool offer) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = + rtc::make_ref_counted(); if (offer) { pc_->CreateOffer(observer, options ? *options : RTCOfferAnswerOptions()); } else { @@ -904,8 +904,7 @@ class PeerConnectionInterfaceBaseTest : public ::testing::Test { bool DoSetSessionDescription( std::unique_ptr desc, bool local) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); if (local) { pc_->SetLocalDescription(observer, desc.release()); } else { @@ -931,8 +930,7 @@ class PeerConnectionInterfaceBaseTest : public ::testing::Test { // It does not verify the values in the StatReports since a RTCP packet might // be required. bool DoGetStats(MediaStreamTrackInterface* track) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); if (!pc_->GetStats(observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)) return false; @@ -942,8 +940,8 @@ class PeerConnectionInterfaceBaseTest : public ::testing::Test { // Call the standards-compliant GetStats function. bool DoGetRTCStats() { - rtc::scoped_refptr callback( - new rtc::RefCountedObject()); + auto callback = + rtc::make_ref_counted(); pc_->GetStats(callback); EXPECT_TRUE_WAIT(callback->called(), kTimeout); return callback->called(); @@ -1198,8 +1196,8 @@ class PeerConnectionInterfaceBaseTest : public ::testing::Test { std::unique_ptr CreateOfferWithOptions( const RTCOfferAnswerOptions& offer_answer_options) { RTC_DCHECK(pc_); - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = + rtc::make_ref_counted(); pc_->CreateOffer(observer, offer_answer_options); EXPECT_EQ_WAIT(true, observer->called(), kTimeout); return observer->MoveDescription(); diff --git a/pc/peer_connection_rampup_tests.cc b/pc/peer_connection_rampup_tests.cc index cf3b0a27f5..c353ae5884 100644 --- a/pc/peer_connection_rampup_tests.cc +++ b/pc/peer_connection_rampup_tests.cc @@ -120,7 +120,7 @@ class PeerConnectionWrapperForRampUpTest : public PeerConnectionWrapper { FrameGeneratorCapturerVideoTrackSource::Config config, Clock* clock) { video_track_sources_.emplace_back( - new rtc::RefCountedObject( + rtc::make_ref_counted( config, clock, /*is_screencast=*/false)); video_track_sources_.back()->Start(); return rtc::scoped_refptr( diff --git a/pc/peer_connection_rtp_unittest.cc b/pc/peer_connection_rtp_unittest.cc index 54287e7b3b..2822854a2d 100644 --- a/pc/peer_connection_rtp_unittest.cc +++ b/pc/peer_connection_rtp_unittest.cc @@ -919,7 +919,7 @@ TEST_P(PeerConnectionRtpTest, auto callee = CreatePeerConnection(); rtc::scoped_refptr observer = - new rtc::RefCountedObject(); + rtc::make_ref_counted(); auto offer = caller->CreateOfferAndSetAsLocal(); callee->pc()->SetRemoteDescription(observer, offer.release()); diff --git a/pc/peer_connection_signaling_unittest.cc b/pc/peer_connection_signaling_unittest.cc index 74c2c7b904..ba7d813f1c 100644 --- a/pc/peer_connection_signaling_unittest.cc +++ b/pc/peer_connection_signaling_unittest.cc @@ -537,8 +537,7 @@ TEST_P(PeerConnectionSignalingTest, CreateOffersAndShutdown) { rtc::scoped_refptr observers[100]; for (auto& observer : observers) { - observer = - new rtc::RefCountedObject(); + observer = rtc::make_ref_counted(); caller->pc()->CreateOffer(observer, options); } @@ -559,8 +558,7 @@ TEST_P(PeerConnectionSignalingTest, CreateOffersAndShutdown) { // the WebRtcSessionDescriptionFactory is responsible for it. TEST_P(PeerConnectionSignalingTest, CloseCreateOfferAndShutdown) { auto caller = CreatePeerConnection(); - rtc::scoped_refptr observer = - new rtc::RefCountedObject(); + auto observer = rtc::make_ref_counted(); caller->pc()->Close(); caller->pc()->CreateOffer(observer, RTCOfferAnswerOptions()); caller.reset(nullptr); @@ -687,8 +685,8 @@ TEST_P(PeerConnectionSignalingTest, CreateOfferBlocksSetRemoteDescription) { auto offer = caller->CreateOffer(RTCOfferAnswerOptions()); EXPECT_EQ(0u, callee->pc()->GetReceivers().size()); - rtc::scoped_refptr offer_observer( - new rtc::RefCountedObject()); + auto offer_observer = + rtc::make_ref_counted(); // Synchronously invoke CreateOffer() and SetRemoteDescription(). The // SetRemoteDescription() operation should be chained to be executed // asynchronously, when CreateOffer() completes. @@ -985,7 +983,7 @@ TEST_F(PeerConnectionSignalingUnifiedPlanTest, // waiting for it would not ensure synchronicity. RTC_DCHECK(!caller->pc()->GetTransceivers()[0]->mid().has_value()); caller->pc()->SetLocalDescription( - new rtc::RefCountedObject(), + rtc::make_ref_counted(), offer.release()); EXPECT_TRUE(caller->pc()->GetTransceivers()[0]->mid().has_value()); } @@ -1013,9 +1011,8 @@ TEST_F(PeerConnectionSignalingUnifiedPlanTest, // This offer will cause transceiver mids to get assigned. auto offer = caller->CreateOffer(RTCOfferAnswerOptions()); - rtc::scoped_refptr - offer_observer(new rtc::RefCountedObject< - ExecuteFunctionOnCreateSessionDescriptionObserver>( + auto offer_observer = + rtc::make_ref_counted( [pc = caller->pc()](SessionDescriptionInterface* desc) { // By not waiting for the observer's callback we can verify that the // operation executed immediately. @@ -1024,7 +1021,7 @@ TEST_F(PeerConnectionSignalingUnifiedPlanTest, new rtc::RefCountedObject(), desc); EXPECT_TRUE(pc->GetTransceivers()[0]->mid().has_value()); - })); + }); caller->pc()->CreateOffer(offer_observer, RTCOfferAnswerOptions()); EXPECT_TRUE_WAIT(offer_observer->was_called(), kWaitTimeout); } @@ -1111,8 +1108,7 @@ TEST_F(PeerConnectionSignalingUnifiedPlanTest, caller->AddTransceiver(cricket::MEDIA_TYPE_AUDIO, RtpTransceiverInit()); EXPECT_TRUE(caller->observer()->has_negotiation_needed_event()); - rtc::scoped_refptr observer = - new rtc::RefCountedObject(); + auto observer = rtc::make_ref_counted(); caller->pc()->CreateOffer(observer, RTCOfferAnswerOptions()); // For this test to work, the operation has to be pending, i.e. the observer // has not yet been invoked. diff --git a/pc/peer_connection_wrapper.cc b/pc/peer_connection_wrapper.cc index 65384ee447..6aed8f1de7 100644 --- a/pc/peer_connection_wrapper.cc +++ b/pc/peer_connection_wrapper.cc @@ -136,8 +136,7 @@ PeerConnectionWrapper::CreateRollback() { std::unique_ptr PeerConnectionWrapper::CreateSdp( rtc::FunctionView fn, std::string* error_out) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); fn(observer); EXPECT_EQ_WAIT(true, observer->called(), kDefaultTimeout); if (error_out && !observer->result()) { @@ -182,8 +181,7 @@ bool PeerConnectionWrapper::SetRemoteDescription( bool PeerConnectionWrapper::SetSdp( rtc::FunctionView fn, std::string* error_out) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); fn(observer); EXPECT_EQ_WAIT(true, observer->called(), kDefaultTimeout); if (error_out && !observer->result()) { @@ -326,8 +324,7 @@ bool PeerConnectionWrapper::IsIceConnected() { rtc::scoped_refptr PeerConnectionWrapper::GetStats() { - rtc::scoped_refptr callback( - new rtc::RefCountedObject()); + auto callback = rtc::make_ref_counted(); pc()->GetStats(callback); EXPECT_TRUE_WAIT(callback->called(), kDefaultTimeout); return callback->report(); diff --git a/pc/proxy_unittest.cc b/pc/proxy_unittest.cc index fdc7dc3e70..f59250d49f 100644 --- a/pc/proxy_unittest.cc +++ b/pc/proxy_unittest.cc @@ -43,7 +43,7 @@ class FakeInterface : public rtc::RefCountInterface { class Fake : public FakeInterface { public: static rtc::scoped_refptr Create() { - return new rtc::RefCountedObject(); + return rtc::make_ref_counted(); } // Used to verify destructor is called on the correct thread. MOCK_METHOD(void, Destroy, ()); diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index 93aa6af7a8..7e781a7245 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -1097,8 +1097,7 @@ RTCStatsCollector::RequestInfo::RequestInfo( rtc::scoped_refptr RTCStatsCollector::Create( PeerConnectionInternal* pc, int64_t cache_lifetime_us) { - return rtc::scoped_refptr( - new rtc::RefCountedObject(pc, cache_lifetime_us)); + return rtc::make_ref_counted(pc, cache_lifetime_us); } RTCStatsCollector::RTCStatsCollector(PeerConnectionInternal* pc, diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc index 2bf026eabb..d92e7ff29b 100644 --- a/pc/rtc_stats_integrationtest.cc +++ b/pc/rtc_stats_integrationtest.cc @@ -114,9 +114,9 @@ class RTCStatsIntegrationTest : public ::testing::Test { RTC_CHECK(network_thread_->Start()); RTC_CHECK(worker_thread_->Start()); - caller_ = new rtc::RefCountedObject( + caller_ = rtc::make_ref_counted( "caller", network_thread_.get(), worker_thread_.get()); - callee_ = new rtc::RefCountedObject( + callee_ = rtc::make_ref_counted( "callee", network_thread_.get(), worker_thread_.get()); } diff --git a/pc/rtp_sender.cc b/pc/rtp_sender.cc index 7026dd9db7..aa268cef45 100644 --- a/pc/rtp_sender.cc +++ b/pc/rtp_sender.cc @@ -424,9 +424,8 @@ rtc::scoped_refptr AudioRtpSender::Create( const std::string& id, StatsCollectorInterface* stats, SetStreamsObserver* set_streams_observer) { - return rtc::scoped_refptr( - new rtc::RefCountedObject(worker_thread, id, stats, - set_streams_observer)); + return rtc::make_ref_counted(worker_thread, id, stats, + set_streams_observer); } AudioRtpSender::AudioRtpSender(rtc::Thread* worker_thread, @@ -571,9 +570,8 @@ rtc::scoped_refptr VideoRtpSender::Create( rtc::Thread* worker_thread, const std::string& id, SetStreamsObserver* set_streams_observer) { - return rtc::scoped_refptr( - new rtc::RefCountedObject(worker_thread, id, - set_streams_observer)); + return rtc::make_ref_counted(worker_thread, id, + set_streams_observer); } VideoRtpSender::VideoRtpSender(rtc::Thread* worker_thread, diff --git a/pc/scenario_tests/goog_cc_test.cc b/pc/scenario_tests/goog_cc_test.cc index 4a996b8684..d9e27e2edf 100644 --- a/pc/scenario_tests/goog_cc_test.cc +++ b/pc/scenario_tests/goog_cc_test.cc @@ -73,8 +73,8 @@ TEST(GoogCcPeerScenarioTest, MAYBE_NoBweChangeFromVideoUnmute) { ASSERT_EQ(num_video_streams, 1); // Exactly 1 video stream. auto get_bwe = [&] { - rtc::scoped_refptr callback( - new rtc::RefCountedObject()); + auto callback = + rtc::make_ref_counted(); caller->pc()->GetStats(callback); s.net()->time_controller()->Wait([&] { return callback->called(); }); auto stats = diff --git a/pc/sctp_data_channel.cc b/pc/sctp_data_channel.cc index be20c3d80c..f67a0e7ea7 100644 --- a/pc/sctp_data_channel.cc +++ b/pc/sctp_data_channel.cc @@ -135,9 +135,8 @@ rtc::scoped_refptr SctpDataChannel::Create( const InternalDataChannelInit& config, rtc::Thread* signaling_thread, rtc::Thread* network_thread) { - rtc::scoped_refptr channel( - new rtc::RefCountedObject( - config, provider, label, signaling_thread, network_thread)); + auto channel = rtc::make_ref_counted( + config, provider, label, signaling_thread, network_thread); if (!channel->Init()) { return nullptr; } diff --git a/pc/sctp_transport_unittest.cc b/pc/sctp_transport_unittest.cc index f3070cd9a7..8ab4482b1a 100644 --- a/pc/sctp_transport_unittest.cc +++ b/pc/sctp_transport_unittest.cc @@ -112,8 +112,8 @@ class SctpTransportTest : public ::testing::Test { void CreateTransport() { auto cricket_sctp_transport = absl::WrapUnique(new FakeCricketSctpTransport()); - transport_ = new rtc::RefCountedObject( - std::move(cricket_sctp_transport)); + transport_ = + rtc::make_ref_counted(std::move(cricket_sctp_transport)); } void AddDtlsTransport() { @@ -121,7 +121,7 @@ class SctpTransportTest : public ::testing::Test { std::make_unique( "audio", cricket::ICE_CANDIDATE_COMPONENT_RTP); dtls_transport_ = - new rtc::RefCountedObject(std::move(cricket_transport)); + rtc::make_ref_counted(std::move(cricket_transport)); transport_->SetDtlsTransport(dtls_transport_); } @@ -147,7 +147,7 @@ TEST(SctpTransportSimpleTest, CreateClearDelete) { std::unique_ptr fake_cricket_sctp_transport = absl::WrapUnique(new FakeCricketSctpTransport()); rtc::scoped_refptr sctp_transport = - new rtc::RefCountedObject( + rtc::make_ref_counted( std::move(fake_cricket_sctp_transport)); ASSERT_TRUE(sctp_transport->internal()); ASSERT_EQ(SctpTransportState::kNew, sctp_transport->Information().state()); 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 { public: explicit FakeAudioTrack(const std::string& id) : MediaStreamTrack(id), - processor_(new rtc::RefCountedObject()) {} + processor_(rtc::make_ref_counted()) {} 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(id), - processor_( - new rtc::RefCountedObject()) {} + processor_(rtc::make_ref_counted()) {} 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 CreatePeerConnection() { - return new rtc::RefCountedObject(); + return rtc::make_ref_counted(); } std::unique_ptr CreateStatsCollector( @@ -738,8 +737,7 @@ class StatsCollectorTest : public ::testing::Test { static rtc::scoped_refptr CreateMockSender( rtc::scoped_refptr track, uint32_t ssrc) { - rtc::scoped_refptr sender( - new rtc::RefCountedObject()); + auto sender = rtc::make_ref_counted(); 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 CreateMockSender( static rtc::scoped_refptr CreateMockReceiver( rtc::scoped_refptr track, uint32_t ssrc) { - rtc::scoped_refptr receiver( - new rtc::RefCountedObject()); + auto receiver = rtc::make_ref_counted(); 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 AddOutgoingAudioTrack( FakePeerConnectionForStats* pc, StatsCollectorForTest* stats) { - audio_track_ = new rtc::RefCountedObject(kLocalTrackId); + audio_track_ = rtc::make_ref_counted(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(kRemoteTrackId); + audio_track_ = rtc::make_ref_counted(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 local_track( - new rtc::RefCountedObject(kLocalTrackId)); + auto local_track = + rtc::make_ref_counted(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 remote_stream( MediaStream::Create("remotestreamid")); - rtc::scoped_refptr remote_track( - new rtc::RefCountedObject(kRemoteTrackId)); + auto remote_track = + rtc::make_ref_counted(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 remote_stream( MediaStream::Create("remotestreamid")); - rtc::scoped_refptr remote_track( - new rtc::RefCountedObject(kRemoteTrackId)); + auto remote_track = rtc::make_ref_counted(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 new_audio_track( - new rtc::RefCountedObject(kNewTrackId)); + auto new_audio_track = rtc::make_ref_counted(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 local_track( - new rtc::RefCountedObject(kLocalTrackId)); + auto local_track = + rtc::make_ref_counted(kLocalTrackId); pc->AddSender(CreateMockSender(local_track, kFirstSsrc)); stats->AddLocalAudioTrack(local_track.get(), kFirstSsrc); pc->AddSender(CreateMockSender(local_track, kSecondSsrc)); diff --git a/pc/stream_collection.h b/pc/stream_collection.h index 28cd46fc5d..9bbf957efd 100644 --- a/pc/stream_collection.h +++ b/pc/stream_collection.h @@ -22,16 +22,12 @@ namespace webrtc { class StreamCollection : public StreamCollectionInterface { public: static rtc::scoped_refptr Create() { - rtc::RefCountedObject* implementation = - new rtc::RefCountedObject(); - return implementation; + return rtc::make_ref_counted(); } static rtc::scoped_refptr Create( StreamCollection* streams) { - rtc::RefCountedObject* implementation = - new rtc::RefCountedObject(streams); - return implementation; + return rtc::make_ref_counted(streams); } virtual size_t count() { return media_streams_.size(); } diff --git a/pc/test/fake_audio_capture_module.cc b/pc/test/fake_audio_capture_module.cc index a395df0409..214ed6b523 100644 --- a/pc/test/fake_audio_capture_module.cc +++ b/pc/test/fake_audio_capture_module.cc @@ -58,8 +58,7 @@ FakeAudioCaptureModule::~FakeAudioCaptureModule() { } rtc::scoped_refptr FakeAudioCaptureModule::Create() { - rtc::scoped_refptr capture_module( - new rtc::RefCountedObject()); + auto capture_module = rtc::make_ref_counted(); if (!capture_module->Initialize()) { return nullptr; } diff --git a/pc/test/fake_video_track_source.h b/pc/test/fake_video_track_source.h index d6562313c5..2042c39175 100644 --- a/pc/test/fake_video_track_source.h +++ b/pc/test/fake_video_track_source.h @@ -22,7 +22,7 @@ namespace webrtc { class FakeVideoTrackSource : public VideoTrackSource { public: static rtc::scoped_refptr Create(bool is_screencast) { - return new rtc::RefCountedObject(is_screencast); + return rtc::make_ref_counted(is_screencast); } static rtc::scoped_refptr Create() { diff --git a/pc/test/integration_test_helpers.h b/pc/test/integration_test_helpers.h index 075a907200..3fe9daf8ba 100644 --- a/pc/test/integration_test_helpers.h +++ b/pc/test/integration_test_helpers.h @@ -451,8 +451,7 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, // which can be used to access the gathered stats. rtc::scoped_refptr OldGetStatsForTrack( webrtc::MediaStreamTrackInterface* track) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); EXPECT_TRUE(peer_connection_->GetStats( observer, nullptr, PeerConnectionInterface::kStatsOutputLevelStandard)); EXPECT_TRUE_WAIT(observer->called(), kDefaultTimeout); @@ -467,8 +466,8 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, // Synchronously gets stats and returns them. If it times out, fails the test // and returns null. rtc::scoped_refptr NewGetStats() { - rtc::scoped_refptr callback( - new rtc::RefCountedObject()); + auto callback = + rtc::make_ref_counted(); peer_connection_->GetStats(callback); EXPECT_TRUE_WAIT(callback->called(), kDefaultTimeout); return callback->report(); @@ -605,8 +604,8 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, // Returns null on failure. std::unique_ptr CreateOfferAndWait() { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = + rtc::make_ref_counted(); pc()->CreateOffer(observer, offer_answer_options_); return WaitForDescriptionFromObserver(observer); } @@ -828,7 +827,7 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, config.frame_interval_ms = 100; video_track_sources_.emplace_back( - new rtc::RefCountedObject( + rtc::make_ref_counted( config, false /* remote */)); rtc::scoped_refptr track( peer_connection_factory_->CreateVideoTrack( @@ -874,8 +873,8 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, // Returns null on failure. std::unique_ptr CreateAnswer() { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = + rtc::make_ref_counted(); pc()->CreateAnswer(observer, offer_answer_options_); return WaitForDescriptionFromObserver(observer); } @@ -900,8 +899,7 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, // don't outrace the description. bool SetLocalDescriptionAndSendSdpMessage( std::unique_ptr desc) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); RTC_LOG(LS_INFO) << debug_name_ << ": SetLocalDescriptionAndSendSdpMessage"; SdpType type = desc->GetType(); std::string sdp; @@ -917,8 +915,7 @@ class PeerConnectionIntegrationWrapper : public webrtc::PeerConnectionObserver, } bool SetRemoteDescription(std::unique_ptr desc) { - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); RTC_LOG(LS_INFO) << debug_name_ << ": SetRemoteDescription"; pc()->SetRemoteDescription(observer, desc.release()); RemoveUnusedVideoRenderers(); @@ -1322,8 +1319,7 @@ class MockIceTransportFactory : public IceTransportFactory { int component, IceTransportInit init) { RecordIceTransportCreated(); - return new rtc::RefCountedObject(transport_name, - component); + return rtc::make_ref_counted(transport_name, component); } MOCK_METHOD(void, RecordIceTransportCreated, ()); }; diff --git a/pc/test/mock_peer_connection_observers.h b/pc/test/mock_peer_connection_observers.h index e2accb505d..1d2bde15d5 100644 --- a/pc/test/mock_peer_connection_observers.h +++ b/pc/test/mock_peer_connection_observers.h @@ -286,7 +286,7 @@ class MockSetSessionDescriptionObserver : public webrtc::SetSessionDescriptionObserver { public: static rtc::scoped_refptr Create() { - return new rtc::RefCountedObject(); + return rtc::make_ref_counted(); } MockSetSessionDescriptionObserver() diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc index c3ffcb0893..d88fe0de90 100644 --- a/pc/test/peer_connection_test_wrapper.cc +++ b/pc/test/peer_connection_test_wrapper.cc @@ -221,8 +221,7 @@ void PeerConnectionTestWrapper::SetLocalDescription(SdpType type, << ": SetLocalDescription " << webrtc::SdpTypeToString(type) << " " << sdp; - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); peer_connection_->SetLocalDescription( observer, webrtc::CreateSessionDescription(type, sdp).release()); } @@ -233,8 +232,7 @@ void PeerConnectionTestWrapper::SetRemoteDescription(SdpType type, << ": SetRemoteDescription " << webrtc::SdpTypeToString(type) << " " << sdp; - rtc::scoped_refptr observer( - new rtc::RefCountedObject()); + auto observer = rtc::make_ref_counted(); peer_connection_->SetRemoteDescription( observer, webrtc::CreateSessionDescription(type, sdp).release()); } @@ -331,9 +329,8 @@ PeerConnectionTestWrapper::GetUserMedia( config.frame_interval_ms = 100; config.timestamp_offset_ms = rtc::TimeMillis(); - rtc::scoped_refptr source = - new rtc::RefCountedObject( - config, /* remote */ false); + auto source = rtc::make_ref_counted( + config, /* remote */ false); std::string videotrack_label = stream_id + kVideoTrackLabelBase; rtc::scoped_refptr video_track( diff --git a/pc/test/rtc_stats_obtainer.h b/pc/test/rtc_stats_obtainer.h index 335b9de307..4da23c6628 100644 --- a/pc/test/rtc_stats_obtainer.h +++ b/pc/test/rtc_stats_obtainer.h @@ -20,8 +20,7 @@ class RTCStatsObtainer : public RTCStatsCollectorCallback { public: static rtc::scoped_refptr Create( rtc::scoped_refptr* report_ptr = nullptr) { - return rtc::scoped_refptr( - new rtc::RefCountedObject(report_ptr)); + return rtc::make_ref_counted(report_ptr); } void OnStatsDelivered( diff --git a/pc/track_media_info_map_unittest.cc b/pc/track_media_info_map_unittest.cc index 0cb1e0e277..2a4889a576 100644 --- a/pc/track_media_info_map_unittest.cc +++ b/pc/track_media_info_map_unittest.cc @@ -52,8 +52,7 @@ rtc::scoped_refptr CreateMockRtpSender( } else { first_ssrc = 0; } - rtc::scoped_refptr sender( - new rtc::RefCountedObject()); + auto sender = rtc::make_ref_counted(); EXPECT_CALL(*sender, track()) .WillRepeatedly(::testing::Return(std::move(track))); EXPECT_CALL(*sender, ssrc()).WillRepeatedly(::testing::Return(first_ssrc)); @@ -69,8 +68,7 @@ rtc::scoped_refptr CreateMockRtpReceiver( cricket::MediaType media_type, std::initializer_list ssrcs, rtc::scoped_refptr track) { - rtc::scoped_refptr receiver( - new rtc::RefCountedObject()); + auto receiver = rtc::make_ref_counted(); EXPECT_CALL(*receiver, track()) .WillRepeatedly(::testing::Return(std::move(track))); EXPECT_CALL(*receiver, media_type()) diff --git a/pc/video_rtp_track_source_unittest.cc b/pc/video_rtp_track_source_unittest.cc index ea1b4cacf8..5666b77d5f 100644 --- a/pc/video_rtp_track_source_unittest.cc +++ b/pc/video_rtp_track_source_unittest.cc @@ -30,9 +30,7 @@ class MockSink : public rtc::VideoSinkInterface { rtc::scoped_refptr MakeSource( VideoRtpTrackSource::Callback* callback) { - rtc::scoped_refptr source( - new rtc::RefCountedObject(callback)); - return source; + return rtc::make_ref_counted(callback); } TEST(VideoRtpTrackSourceTest, CreatesWithRemoteAtttributeSet) { diff --git a/pc/video_track.cc b/pc/video_track.cc index d67d4f6cd2..b4f511b5fb 100644 --- a/pc/video_track.cc +++ b/pc/video_track.cc @@ -95,9 +95,7 @@ rtc::scoped_refptr VideoTrack::Create( const std::string& id, VideoTrackSourceInterface* source, rtc::Thread* worker_thread) { - rtc::RefCountedObject* track = - new rtc::RefCountedObject(id, source, worker_thread); - return track; + return rtc::make_ref_counted(id, source, worker_thread); } } // namespace webrtc diff --git a/pc/video_track_unittest.cc b/pc/video_track_unittest.cc index f86bec8321..ab094ec487 100644 --- a/pc/video_track_unittest.cc +++ b/pc/video_track_unittest.cc @@ -32,7 +32,7 @@ class VideoTrackTest : public ::testing::Test { public: VideoTrackTest() : frame_source_(640, 480, rtc::kNumMicrosecsPerSec / 30) { static const char kVideoTrackId[] = "track_id"; - video_track_source_ = new rtc::RefCountedObject( + video_track_source_ = rtc::make_ref_counted( /*is_screencast=*/false); video_track_ = VideoTrack::Create(kVideoTrackId, video_track_source_, rtc::Thread::Current()); diff --git a/pc/webrtc_session_description_factory.cc b/pc/webrtc_session_description_factory.cc index 348016d2d6..33826347ff 100644 --- a/pc/webrtc_session_description_factory.cc +++ b/pc/webrtc_session_description_factory.cc @@ -174,8 +174,7 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( // Generate certificate. certificate_request_state_ = CERTIFICATE_WAITING; - rtc::scoped_refptr callback( - new rtc::RefCountedObject()); + auto callback = rtc::make_ref_counted(); callback->SignalRequestFailed.connect( this, &WebRtcSessionDescriptionFactory::OnCertificateRequestFailed); callback->SignalCertificateReady.connect( diff --git a/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc b/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc index becc0044ab..51cc3b9245 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyze_audio.cc @@ -314,7 +314,7 @@ std::unique_ptr CreateNetEqTestAndRun( std::unique_ptr output(new test::VoidAudioSink()); rtc::scoped_refptr decoder_factory = - new rtc::RefCountedObject( + rtc::make_ref_counted( replacement_file_name, file_sample_rate_hz); test::NetEqTest::DecoderMap codecs = { diff --git a/rtc_tools/rtp_generator/rtp_generator.cc b/rtc_tools/rtp_generator/rtp_generator.cc index 21826c8dff..3180897ec5 100644 --- a/rtc_tools/rtp_generator/rtp_generator.cc +++ b/rtc_tools/rtp_generator/rtp_generator.cc @@ -188,15 +188,17 @@ RtpGenerator::RtpGenerator(const RtpGeneratorOptions& options) PayloadStringToCodecType(video_config.rtp.payload_name); if (video_config.rtp.payload_name == cricket::kVp8CodecName) { VideoCodecVP8 settings = VideoEncoder::GetDefaultVp8Settings(); - encoder_config.encoder_specific_settings = new rtc::RefCountedObject< - VideoEncoderConfig::Vp8EncoderSpecificSettings>(settings); + encoder_config.encoder_specific_settings = + rtc::make_ref_counted( + settings); } else if (video_config.rtp.payload_name == cricket::kVp9CodecName) { VideoCodecVP9 settings = VideoEncoder::GetDefaultVp9Settings(); - encoder_config.encoder_specific_settings = new rtc::RefCountedObject< - VideoEncoderConfig::Vp9EncoderSpecificSettings>(settings); + encoder_config.encoder_specific_settings = + rtc::make_ref_counted( + settings); } else if (video_config.rtp.payload_name == cricket::kH264CodecName) { VideoCodecH264 settings = VideoEncoder::GetDefaultH264Settings(); - encoder_config.encoder_specific_settings = new rtc::RefCountedObject< + encoder_config.encoder_specific_settings = rtc::make_ref_counted< VideoEncoderConfig::H264EncoderSpecificSettings>(settings); } encoder_config.video_format.name = video_config.rtp.payload_name; @@ -217,7 +219,7 @@ RtpGenerator::RtpGenerator(const RtpGeneratorOptions& options) } encoder_config.video_stream_factory = - new rtc::RefCountedObject( + rtc::make_ref_counted( video_config.rtp.payload_name, /*max qp*/ 56, /*screencast*/ false, /*screenshare enabled*/ false); diff --git a/rtc_tools/video_file_reader.cc b/rtc_tools/video_file_reader.cc index b01fc0fcdd..bfdcba45fa 100644 --- a/rtc_tools/video_file_reader.cc +++ b/rtc_tools/video_file_reader.cc @@ -224,8 +224,8 @@ rtc::scoped_refptr