Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}diff --git a/sdk/android/native_api/audio_device_module/audio_device_android.cc b/sdk/android/native_api/audio_device_module/audio_device_android.cc
index b7843d6..89ffeb6 100644
--- a/sdk/android/native_api/audio_device_module/audio_device_android.cc
+++ b/sdk/android/native_api/audio_device_module/audio_device_android.cc
@@ -13,8 +13,8 @@
#include <stdlib.h>
#include <utility>
+#include "absl/memory/memory.h"
#include "rtc_base/logging.h"
-#include "rtc_base/ptr_util.h"
#include "rtc_base/refcount.h"
#include "rtc_base/refcountedobject.h"
@@ -64,8 +64,8 @@
AudioDeviceModule::kAndroidAAudioAudio, false /* use_stereo_input */,
false /* use_stereo_output */,
jni::kLowLatencyModeDelayEstimateInMilliseconds,
- rtc::MakeUnique<jni::AAudioRecorder>(input_parameters),
- rtc::MakeUnique<jni::AAudioPlayer>(output_parameters));
+ absl::make_unique<jni::AAudioRecorder>(input_parameters),
+ absl::make_unique<jni::AAudioPlayer>(output_parameters));
}
#endif
@@ -82,11 +82,11 @@
GetDefaultAudioParameters(env, application_context, &input_parameters,
&output_parameters);
// Create ADM from AudioRecord and AudioTrack.
- auto audio_input = rtc::MakeUnique<jni::AudioRecordJni>(
+ auto audio_input = absl::make_unique<jni::AudioRecordJni>(
env, input_parameters, jni::kHighLatencyModeDelayEstimateInMilliseconds,
jni::AudioRecordJni::CreateJavaWebRtcAudioRecord(env, j_context,
j_audio_manager));
- auto audio_output = rtc::MakeUnique<jni::AudioTrackJni>(
+ auto audio_output = absl::make_unique<jni::AudioTrackJni>(
env, output_parameters,
jni::AudioTrackJni::CreateJavaWebRtcAudioTrack(env, j_context,
j_audio_manager));
@@ -107,10 +107,10 @@
GetDefaultAudioParameters(env, application_context, &input_parameters,
&output_parameters);
// Create ADM from OpenSLESRecorder and OpenSLESPlayer.
- auto engine_manager = rtc::MakeUnique<jni::OpenSLEngineManager>();
- auto audio_input = rtc::MakeUnique<jni::OpenSLESRecorder>(
+ auto engine_manager = absl::make_unique<jni::OpenSLEngineManager>();
+ auto audio_input = absl::make_unique<jni::OpenSLESRecorder>(
input_parameters, engine_manager.get());
- auto audio_output = rtc::MakeUnique<jni::OpenSLESPlayer>(
+ auto audio_output = absl::make_unique<jni::OpenSLESPlayer>(
output_parameters, std::move(engine_manager));
return CreateAudioDeviceModuleFromInputAndOutput(
AudioDeviceModule::kAndroidOpenSLESAudio, false /* use_stereo_input */,
@@ -132,12 +132,12 @@
GetDefaultAudioParameters(env, application_context, &input_parameters,
&output_parameters);
// Create ADM from AudioRecord and OpenSLESPlayer.
- auto audio_input = rtc::MakeUnique<jni::AudioRecordJni>(
+ auto audio_input = absl::make_unique<jni::AudioRecordJni>(
env, input_parameters, jni::kLowLatencyModeDelayEstimateInMilliseconds,
jni::AudioRecordJni::CreateJavaWebRtcAudioRecord(env, j_context,
j_audio_manager));
- auto audio_output = rtc::MakeUnique<jni::OpenSLESPlayer>(
- output_parameters, rtc::MakeUnique<jni::OpenSLEngineManager>());
+ auto audio_output = absl::make_unique<jni::OpenSLESPlayer>(
+ output_parameters, absl::make_unique<jni::OpenSLEngineManager>());
return CreateAudioDeviceModuleFromInputAndOutput(
AudioDeviceModule::kAndroidJavaInputAndOpenSLESOutputAudio,
false /* use_stereo_input */, false /* use_stereo_output */,
diff --git a/sdk/android/native_api/base/networkmonitor.cc b/sdk/android/native_api/base/networkmonitor.cc
index a7cf456..5d33ab7 100644
--- a/sdk/android/native_api/base/networkmonitor.cc
+++ b/sdk/android/native_api/base/networkmonitor.cc
@@ -12,7 +12,7 @@
#include <memory>
-#include "rtc_base/ptr_util.h"
+#include "absl/memory/memory.h"
#include "sdk/android/src/jni/androidnetworkmonitor.h"
namespace webrtc {
@@ -20,13 +20,13 @@
std::unique_ptr<rtc::NetworkMonitorFactory> CreateAndroidNetworkMonitorFactory(
JNIEnv* env,
jobject application_context) {
- return rtc::MakeUnique<jni::AndroidNetworkMonitorFactory>(
+ return absl::make_unique<jni::AndroidNetworkMonitorFactory>(
env, JavaParamRef<jobject>(application_context));
}
std::unique_ptr<rtc::NetworkMonitorFactory>
CreateAndroidNetworkMonitorFactory() {
- return rtc::MakeUnique<jni::AndroidNetworkMonitorFactory>();
+ return absl::make_unique<jni::AndroidNetworkMonitorFactory>();
}
} // namespace webrtc
diff --git a/sdk/android/native_api/codecs/wrapper.cc b/sdk/android/native_api/codecs/wrapper.cc
index d7ff44d..5448955 100644
--- a/sdk/android/native_api/codecs/wrapper.cc
+++ b/sdk/android/native_api/codecs/wrapper.cc
@@ -10,7 +10,7 @@
#include "sdk/android/native_api/codecs/wrapper.h"
-#include "rtc_base/ptr_util.h"
+#include "absl/memory/memory.h"
#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
@@ -19,14 +19,14 @@
std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
JNIEnv* jni,
jobject decoder_factory) {
- return rtc::MakeUnique<jni::VideoDecoderFactoryWrapper>(
+ return absl::make_unique<jni::VideoDecoderFactoryWrapper>(
jni, JavaParamRef<jobject>(decoder_factory));
}
std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory(
JNIEnv* jni,
jobject en) {
- return rtc::MakeUnique<jni::VideoEncoderFactoryWrapper>(
+ return absl::make_unique<jni::VideoEncoderFactoryWrapper>(
jni, JavaParamRef<jobject>(en));
}
diff --git a/sdk/android/native_api/video/wrapper.cc b/sdk/android/native_api/video/wrapper.cc
index cc626c8..fe2d45a 100644
--- a/sdk/android/native_api/video/wrapper.cc
+++ b/sdk/android/native_api/video/wrapper.cc
@@ -10,7 +10,7 @@
#include "sdk/android/native_api/video/wrapper.h"
-#include "rtc_base/ptr_util.h"
+#include "absl/memory/memory.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
#include "sdk/android/src/jni/videoframe.h"
#include "sdk/android/src/jni/videosink.h"
@@ -20,7 +20,7 @@
std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> JavaToNativeVideoSink(
JNIEnv* jni,
jobject video_sink) {
- return rtc::MakeUnique<jni::VideoSinkWrapper>(
+ return absl::make_unique<jni::VideoSinkWrapper>(
jni, JavaParamRef<jobject>(video_sink));
}