Update test/ to not use implicit T* --> scoped_refptr<T> conversion
Bug: webrtc:13464
Change-Id: Id0191dfb2028e29499fabb6c58a00c06460c01dd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/246200
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35685}
diff --git a/test/mappable_native_buffer.cc b/test/mappable_native_buffer.cc
index 5625731..48b9379 100644
--- a/test/mappable_native_buffer.cc
+++ b/test/mappable_native_buffer.cc
@@ -59,7 +59,8 @@
rtc::scoped_refptr<MappableNativeBuffer> GetMappableNativeBufferFromVideoFrame(
const VideoFrame& frame) {
- return static_cast<MappableNativeBuffer*>(frame.video_frame_buffer().get());
+ return rtc::scoped_refptr<MappableNativeBuffer>(
+ static_cast<MappableNativeBuffer*>(frame.video_frame_buffer().get()));
}
MappableNativeBuffer::ScaledBuffer::ScaledBuffer(
@@ -145,7 +146,8 @@
rtc::scoped_refptr<MappableNativeBuffer::ScaledBuffer>
MappableNativeBuffer::FullSizeBuffer() {
- return rtc::make_ref_counted<ScaledBuffer>(this, width_, height_);
+ return rtc::make_ref_counted<ScaledBuffer>(
+ rtc::scoped_refptr<MappableNativeBuffer>(this), width_, height_);
}
rtc::scoped_refptr<VideoFrameBuffer>
diff --git a/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h
index 392a4c1..fc150d6 100644
--- a/test/mock_audio_encoder_factory.h
+++ b/test/mock_audio_encoder_factory.h
@@ -57,8 +57,7 @@
using ::testing::AnyNumber;
using ::testing::Return;
- rtc::scoped_refptr<webrtc::MockAudioEncoderFactory> factory =
- new rtc::RefCountedObject<webrtc::MockAudioEncoderFactory>;
+ auto factory = rtc::make_ref_counted<webrtc::MockAudioEncoderFactory>();
ON_CALL(*factory.get(), GetSupportedEncoders())
.WillByDefault(Return(std::vector<webrtc::AudioCodecSpec>()));
ON_CALL(*factory.get(), QueryAudioEncoder(_))
@@ -80,8 +79,7 @@
using ::testing::Return;
using ::testing::SetArgPointee;
- rtc::scoped_refptr<webrtc::MockAudioEncoderFactory> factory =
- new rtc::RefCountedObject<webrtc::MockAudioEncoderFactory>;
+ auto factory = rtc::make_ref_counted<webrtc::MockAudioEncoderFactory>();
ON_CALL(*factory.get(), GetSupportedEncoders())
.WillByDefault(Return(std::vector<webrtc::AudioCodecSpec>()));
ON_CALL(*factory.get(), QueryAudioEncoder(_))
diff --git a/test/win/d3d_renderer.cc b/test/win/d3d_renderer.cc
index 18c6cd7..64b7184 100644
--- a/test/win/d3d_renderer.cc
+++ b/test/win/d3d_renderer.cc
@@ -34,10 +34,10 @@
: width_(width),
height_(height),
hwnd_(NULL),
- d3d_(NULL),
- d3d_device_(NULL),
- texture_(NULL),
- vertex_buffer_(NULL) {
+ d3d_(nullptr),
+ d3d_device_(nullptr),
+ texture_(nullptr),
+ vertex_buffer_(nullptr) {
RTC_DCHECK_GT(width, 0);
RTC_DCHECK_GT(height, 0);
}
@@ -59,10 +59,10 @@
}
void D3dRenderer::Destroy() {
- texture_ = NULL;
- vertex_buffer_ = NULL;
- d3d_device_ = NULL;
- d3d_ = NULL;
+ texture_ = nullptr;
+ vertex_buffer_ = nullptr;
+ d3d_device_ = nullptr;
+ d3d_ = nullptr;
if (hwnd_ != NULL) {
DestroyWindow(hwnd_);
@@ -82,7 +82,7 @@
}
d3d_ = Direct3DCreate9(D3D_SDK_VERSION);
- if (d3d_ == NULL) {
+ if (d3d_ == nullptr) {
Destroy();
return false;
}