Use std::make_unique instead of absl::make_unique.
WebRTC is now using C++14 so there is no need to use the Abseil version
of std::make_unique.
This CL has been created with the following steps:
git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt
git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt
git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt
diff --new-line-format="" --unchanged-line-format="" \
/tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \
uniq > /tmp/only_make_unique.txt
diff --new-line-format="" --unchanged-line-format="" \
/tmp/only_make_unique.txt /tmp/memory.txt | \
xargs grep -l "absl/memory" > /tmp/add-memory.txt
git grep -l "\babsl::make_unique\b" | \
xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g"
git checkout PRESUBMIT.py abseil-in-webrtc.md
cat /tmp/add-memory.txt | \
xargs sed -i \
's/#include "absl\/memory\/memory.h"/#include <memory>/g'
git cl format
# Manual fix order of the new inserted #include <memory>
cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \
xargs sed -i '/#include "absl\/memory\/memory.h"/d'
git ls-files | grep BUILD.gn | \
xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d'
python tools_webrtc/gn_check_autofix.py \
-m tryserver.webrtc -b linux_rel
# Repead the gn_check_autofix step for other platforms
git ls-files | grep BUILD.gn | \
xargs sed -i 's/absl\/memory:memory/absl\/memory/g'
git cl format
Bug: webrtc:10945
Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29209}
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 6fa4971..c3e7885 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -947,7 +947,6 @@
"../rtc_base:checks",
"../system_wrappers:field_trial",
"../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
]
if (is_ios) {
@@ -1616,7 +1615,6 @@
"../modules/video_coding:video_codec_interface",
"../rtc_base",
"../rtc_base:checks",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index d94bfe5..6a00b61 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -556,7 +556,6 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -795,7 +794,6 @@
":base_jni",
":generated_java_audio_jni",
":java_audio_device_module",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -896,7 +894,6 @@
":native_api_jni",
"//rtc_base",
"//rtc_base:checks",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -920,7 +917,6 @@
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
]
if (rtc_enable_android_aaudio) {
deps += [ ":aaudio_audio_device_module" ]
@@ -944,7 +940,6 @@
"//api/video_codecs:video_codecs_api",
"//rtc_base:checks",
"//rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -999,7 +994,6 @@
"//api/video:video_rtp_headers",
"//rtc_base",
"//rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -1087,7 +1081,6 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -1164,7 +1157,6 @@
"../../modules/audio_device:audio_device_buffer",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
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 0cbe758..16a3643 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
@@ -11,9 +11,10 @@
#include "sdk/android/native_api/audio_device_module/audio_device_android.h"
#include <stdlib.h>
+
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/scoped_refptr.h"
#include "rtc_base/logging.h"
#include "rtc_base/ref_count.h"
@@ -67,8 +68,8 @@
AudioDeviceModule::kAndroidAAudioAudio, false /* use_stereo_input */,
false /* use_stereo_output */,
jni::kLowLatencyModeDelayEstimateInMilliseconds,
- absl::make_unique<jni::AAudioRecorder>(input_parameters),
- absl::make_unique<jni::AAudioPlayer>(output_parameters));
+ std::make_unique<jni::AAudioRecorder>(input_parameters),
+ std::make_unique<jni::AAudioPlayer>(output_parameters));
}
#endif
@@ -85,11 +86,11 @@
GetDefaultAudioParameters(env, application_context, &input_parameters,
&output_parameters);
// Create ADM from AudioRecord and AudioTrack.
- auto audio_input = absl::make_unique<jni::AudioRecordJni>(
+ auto audio_input = std::make_unique<jni::AudioRecordJni>(
env, input_parameters, jni::kHighLatencyModeDelayEstimateInMilliseconds,
jni::AudioRecordJni::CreateJavaWebRtcAudioRecord(env, j_context,
j_audio_manager));
- auto audio_output = absl::make_unique<jni::AudioTrackJni>(
+ auto audio_output = std::make_unique<jni::AudioTrackJni>(
env, output_parameters,
jni::AudioTrackJni::CreateJavaWebRtcAudioTrack(env, j_context,
j_audio_manager));
@@ -112,9 +113,9 @@
// Create ADM from OpenSLESRecorder and OpenSLESPlayer.
rtc::scoped_refptr<jni::OpenSLEngineManager> engine_manager(
new jni::OpenSLEngineManager());
- auto audio_input = absl::make_unique<jni::OpenSLESRecorder>(input_parameters,
- engine_manager);
- auto audio_output = absl::make_unique<jni::OpenSLESPlayer>(
+ auto audio_input =
+ std::make_unique<jni::OpenSLESRecorder>(input_parameters, engine_manager);
+ auto audio_output = std::make_unique<jni::OpenSLESPlayer>(
output_parameters, std::move(engine_manager));
return CreateAudioDeviceModuleFromInputAndOutput(
AudioDeviceModule::kAndroidOpenSLESAudio, false /* use_stereo_input */,
@@ -136,14 +137,14 @@
GetDefaultAudioParameters(env, application_context, &input_parameters,
&output_parameters);
// Create ADM from AudioRecord and OpenSLESPlayer.
- auto audio_input = absl::make_unique<jni::AudioRecordJni>(
+ auto audio_input = std::make_unique<jni::AudioRecordJni>(
env, input_parameters, jni::kLowLatencyModeDelayEstimateInMilliseconds,
jni::AudioRecordJni::CreateJavaWebRtcAudioRecord(env, j_context,
j_audio_manager));
rtc::scoped_refptr<jni::OpenSLEngineManager> engine_manager(
new jni::OpenSLEngineManager());
- auto audio_output = absl::make_unique<jni::OpenSLESPlayer>(
+ auto audio_output = std::make_unique<jni::OpenSLESPlayer>(
output_parameters, std::move(engine_manager));
return CreateAudioDeviceModuleFromInputAndOutput(
AudioDeviceModule::kAndroidJavaInputAndOpenSLESOutputAudio,
diff --git a/sdk/android/native_api/base/network_monitor.cc b/sdk/android/native_api/base/network_monitor.cc
index 822fab9..515e9f2 100644
--- a/sdk/android/native_api/base/network_monitor.cc
+++ b/sdk/android/native_api/base/network_monitor.cc
@@ -12,7 +12,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "sdk/android/src/jni/android_network_monitor.h"
namespace webrtc {
@@ -20,13 +19,13 @@
std::unique_ptr<rtc::NetworkMonitorFactory> CreateAndroidNetworkMonitorFactory(
JNIEnv* env,
jobject application_context) {
- return absl::make_unique<jni::AndroidNetworkMonitorFactory>(
+ return std::make_unique<jni::AndroidNetworkMonitorFactory>(
env, JavaParamRef<jobject>(application_context));
}
std::unique_ptr<rtc::NetworkMonitorFactory>
CreateAndroidNetworkMonitorFactory() {
- return absl::make_unique<jni::AndroidNetworkMonitorFactory>();
+ return std::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 6b78e7e..08cafd8 100644
--- a/sdk/android/native_api/codecs/wrapper.cc
+++ b/sdk/android/native_api/codecs/wrapper.cc
@@ -10,7 +10,8 @@
#include "sdk/android/native_api/codecs/wrapper.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/android/native_api/jni/scoped_java_ref.h"
#include "sdk/android/src/jni/video_codec_info.h"
#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
@@ -26,14 +27,14 @@
std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
JNIEnv* jni,
jobject decoder_factory) {
- return absl::make_unique<jni::VideoDecoderFactoryWrapper>(
+ return std::make_unique<jni::VideoDecoderFactoryWrapper>(
jni, JavaParamRef<jobject>(decoder_factory));
}
std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory(
JNIEnv* jni,
jobject encoder_factory) {
- return absl::make_unique<jni::VideoEncoderFactoryWrapper>(
+ return std::make_unique<jni::VideoEncoderFactoryWrapper>(
jni, JavaParamRef<jobject>(encoder_factory));
}
diff --git a/sdk/android/native_api/video/wrapper.cc b/sdk/android/native_api/video/wrapper.cc
index 7b87ad6..8faddc3 100644
--- a/sdk/android/native_api/video/wrapper.cc
+++ b/sdk/android/native_api/video/wrapper.cc
@@ -10,7 +10,8 @@
#include "sdk/android/native_api/video/wrapper.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/android/native_api/jni/scoped_java_ref.h"
#include "sdk/android/src/jni/video_frame.h"
#include "sdk/android/src/jni/video_sink.h"
@@ -20,7 +21,7 @@
std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> JavaToNativeVideoSink(
JNIEnv* jni,
jobject video_sink) {
- return absl::make_unique<jni::VideoSinkWrapper>(
+ return std::make_unique<jni::VideoSinkWrapper>(
jni, JavaParamRef<jobject>(video_sink));
}
diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
index 6e1e464..b2672e9 100644
--- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
+++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/rtc_event_log/rtc_event_log_factory.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "media/base/media_engine.h"
@@ -49,16 +50,16 @@
pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory();
pcf_deps.call_factory = CreateCallFactory();
pcf_deps.event_log_factory =
- absl::make_unique<RtcEventLogFactory>(pcf_deps.task_queue_factory.get());
+ std::make_unique<RtcEventLogFactory>(pcf_deps.task_queue_factory.get());
cricket::MediaEngineDependencies media_deps;
media_deps.task_queue_factory = pcf_deps.task_queue_factory.get();
media_deps.adm =
CreateJavaAudioDeviceModule(jni, GetAppContextForTest(jni).obj());
media_deps.video_encoder_factory =
- absl::make_unique<webrtc::InternalEncoderFactory>();
+ std::make_unique<webrtc::InternalEncoderFactory>();
media_deps.video_decoder_factory =
- absl::make_unique<webrtc::InternalDecoderFactory>();
+ std::make_unique<webrtc::InternalDecoderFactory>();
SetMediaEngineDefaults(&media_deps);
pcf_deps.media_engine = cricket::CreateMediaEngine(std::move(media_deps));
RTC_LOG(LS_INFO) << "Media engine created: " << pcf_deps.media_engine.get();
diff --git a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
index 917dbc9..e3b5e78 100644
--- a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
+++ b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
@@ -11,10 +11,11 @@
#include "sdk/android/native_api/stacktrace/stacktrace.h"
#include <dlfcn.h>
+
#include <atomic>
+#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/event.h"
#include "rtc_base/logging.h"
@@ -117,7 +118,7 @@
class RtcCriticalSectionDeadlock : public DeadlockInterface {
public:
RtcCriticalSectionDeadlock()
- : critscope_(absl::make_unique<rtc::CritScope>(&crit_)) {}
+ : critscope_(std::make_unique<rtc::CritScope>(&crit_)) {}
private:
void Deadlock() override { rtc::CritScope lock(&crit_); }
@@ -230,11 +231,11 @@
}
TEST(Stacktrace, TestSpinLock) {
- TestStacktrace(absl::make_unique<SpinDeadlock>());
+ TestStacktrace(std::make_unique<SpinDeadlock>());
}
TEST(Stacktrace, TestSleep) {
- TestStacktrace(absl::make_unique<SleepDeadlock>());
+ TestStacktrace(std::make_unique<SleepDeadlock>());
}
// Stack traces originating from kernel space does not include user space stack
@@ -242,11 +243,11 @@
#ifdef WEBRTC_ARCH_ARM64
TEST(Stacktrace, TestRtcEvent) {
- TestStacktrace(absl::make_unique<RtcEventDeadlock>());
+ TestStacktrace(std::make_unique<RtcEventDeadlock>());
}
TEST(Stacktrace, TestRtcCriticalSection) {
- TestStacktrace(absl::make_unique<RtcCriticalSectionDeadlock>());
+ TestStacktrace(std::make_unique<RtcCriticalSectionDeadlock>());
}
#endif
diff --git a/sdk/android/src/jni/android_media_encoder.cc b/sdk/android/src/jni/android_media_encoder.cc
index a035708..78f313a 100644
--- a/sdk/android/src/jni/android_media_encoder.cc
+++ b/sdk/android/src/jni/android_media_encoder.cc
@@ -989,7 +989,7 @@
EncodedImageCallback::Result callback_result(
EncodedImageCallback::Result::OK);
if (callback_) {
- auto image = absl::make_unique<EncodedImage>();
+ auto image = std::make_unique<EncodedImage>();
// The corresponding (and deprecated) java classes are not prepared for
// late calls to releaseOutputBuffer, so to keep things simple, make a
// copy here, and call releaseOutputBuffer before returning.
diff --git a/sdk/android/src/jni/audio_device/aaudio_player.cc b/sdk/android/src/jni/audio_device/aaudio_player.cc
index 5969706..8e1122d 100644
--- a/sdk/android/src/jni/audio_device/aaudio_player.cc
+++ b/sdk/android/src/jni/audio_device/aaudio_player.cc
@@ -10,7 +10,8 @@
#include "sdk/android/src/jni/audio_device/aaudio_player.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/array_view.h"
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/checks.h"
@@ -124,7 +125,7 @@
// Create a modified audio buffer class which allows us to ask for any number
// of samples (and not only multiple of 10ms) to match the optimal buffer
// size per callback used by AAudio.
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
}
bool AAudioPlayer::SpeakerVolumeIsAvailable() {
diff --git a/sdk/android/src/jni/audio_device/aaudio_recorder.cc b/sdk/android/src/jni/audio_device/aaudio_recorder.cc
index 8daafcd..b543645 100644
--- a/sdk/android/src/jni/audio_device/aaudio_recorder.cc
+++ b/sdk/android/src/jni/audio_device/aaudio_recorder.cc
@@ -10,7 +10,8 @@
#include "sdk/android/src/jni/audio_device/aaudio_recorder.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/array_view.h"
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/checks.h"
@@ -120,7 +121,7 @@
// Create a modified audio buffer class which allows us to deliver any number
// of samples (and not only multiples of 10ms which WebRTC uses) to match the
// native AAudio buffer size.
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
}
bool AAudioRecorder::IsAcousticEchoCancelerSupported() const {
diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc
index 0008e7e..b4cb184 100644
--- a/sdk/android/src/jni/audio_device/audio_device_module.cc
+++ b/sdk/android/src/jni/audio_device/audio_device_module.cc
@@ -10,9 +10,9 @@
#include "sdk/android/src/jni/audio_device/audio_device_module.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/task_queue/task_queue_factory.h"
#include "modules/audio_device/audio_device_buffer.h"
@@ -92,7 +92,7 @@
RTC_LOG(INFO) << __FUNCTION__;
RTC_DCHECK(thread_checker_.IsCurrent());
audio_device_buffer_ =
- absl::make_unique<AudioDeviceBuffer>(task_queue_factory_.get());
+ std::make_unique<AudioDeviceBuffer>(task_queue_factory_.get());
AttachAudioBuffer();
if (initialized_) {
return 0;
diff --git a/sdk/android/src/jni/audio_device/java_audio_device_module.cc b/sdk/android/src/jni/audio_device/java_audio_device_module.cc
index 18d0891..1c3cbe4 100644
--- a/sdk/android/src/jni/audio_device/java_audio_device_module.cc
+++ b/sdk/android/src/jni/audio_device/java_audio_device_module.cc
@@ -8,7 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/android/generated_java_audio_jni/JavaAudioDeviceModule_jni.h"
#include "sdk/android/src/jni/audio_device/audio_record_jni.h"
#include "sdk/android/src/jni/audio_device/audio_track_jni.h"
@@ -33,11 +34,11 @@
output_sample_rate, j_use_stereo_input,
j_use_stereo_output, &input_parameters,
&output_parameters);
- auto audio_input = absl::make_unique<AudioRecordJni>(
+ auto audio_input = std::make_unique<AudioRecordJni>(
env, input_parameters, kHighLatencyModeDelayEstimateInMilliseconds,
j_webrtc_audio_record);
- auto audio_output = absl::make_unique<AudioTrackJni>(env, output_parameters,
- j_webrtc_audio_track);
+ auto audio_output = std::make_unique<AudioTrackJni>(env, output_parameters,
+ j_webrtc_audio_track);
return jlongFromPointer(CreateAudioDeviceModuleFromInputAndOutput(
AudioDeviceModule::kAndroidJavaAudio,
j_use_stereo_input, j_use_stereo_output,
diff --git a/sdk/android/src/jni/audio_device/opensles_player.cc b/sdk/android/src/jni/audio_device/opensles_player.cc
index 55030fc..5192acc 100644
--- a/sdk/android/src/jni/audio_device/opensles_player.cc
+++ b/sdk/android/src/jni/audio_device/opensles_player.cc
@@ -12,7 +12,7 @@
#include <android/log.h>
-#include "absl/memory/memory.h"
+#include <memory>
#include "api/array_view.h"
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/arraysize.h"
@@ -226,7 +226,7 @@
ALOGD("native buffer size: %" RTC_PRIuS, buffer_size_in_samples);
ALOGD("native buffer size in ms: %.2f",
audio_parameters_.GetBufferSizeInMilliseconds());
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
// Allocated memory for audio buffers.
for (int i = 0; i < kNumOfOpenSLESBuffers; ++i) {
audio_buffers_[i].reset(new SLint16[buffer_size_in_samples]);
diff --git a/sdk/android/src/jni/audio_device/opensles_recorder.cc b/sdk/android/src/jni/audio_device/opensles_recorder.cc
index ac0d71a..d2eb2de 100644
--- a/sdk/android/src/jni/audio_device/opensles_recorder.cc
+++ b/sdk/android/src/jni/audio_device/opensles_recorder.cc
@@ -12,7 +12,7 @@
#include <android/log.h>
-#include "absl/memory/memory.h"
+#include <memory>
#include "api/array_view.h"
#include "modules/audio_device/fine_audio_buffer.h"
#include "rtc_base/arraysize.h"
@@ -353,7 +353,7 @@
audio_parameters_.GetBytesPerBuffer());
ALOGD("native sample rate: %d", audio_parameters_.sample_rate());
RTC_DCHECK(audio_device_buffer_);
- fine_audio_buffer_ = absl::make_unique<FineAudioBuffer>(audio_device_buffer_);
+ fine_audio_buffer_ = std::make_unique<FineAudioBuffer>(audio_device_buffer_);
// Allocate queue of audio buffers that stores recorded audio samples.
const int buffer_size_samples =
audio_parameters_.frames_per_buffer() * audio_parameters_.channels();
diff --git a/sdk/android/src/jni/pc/data_channel.cc b/sdk/android/src/jni/pc/data_channel.cc
index 64410aa..3552974 100644
--- a/sdk/android/src/jni/pc/data_channel.cc
+++ b/sdk/android/src/jni/pc/data_channel.cc
@@ -12,7 +12,6 @@
#include <limits>
-#include "absl/memory/memory.h"
#include "api/data_channel_interface.h"
#include "rtc_base/logging.h"
#include "sdk/android/generated_peerconnection_jni/DataChannel_jni.h"
@@ -97,7 +96,7 @@
JNIEnv* jni,
const JavaParamRef<jobject>& j_dc,
const JavaParamRef<jobject>& j_observer) {
- auto observer = absl::make_unique<DataChannelObserverJni>(jni, j_observer);
+ auto observer = std::make_unique<DataChannelObserverJni>(jni, j_observer);
ExtractNativeDC(jni, j_dc)->RegisterObserver(observer.get());
return jlongFromPointer(observer.release());
}
diff --git a/sdk/android/src/jni/pc/media_constraints.cc b/sdk/android/src/jni/pc/media_constraints.cc
index 5b52fb1..4e1a3ba 100644
--- a/sdk/android/src/jni/pc/media_constraints.cc
+++ b/sdk/android/src/jni/pc/media_constraints.cc
@@ -10,7 +10,8 @@
#include "sdk/android/src/jni/pc/media_constraints.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/android/generated_peerconnection_jni/MediaConstraints_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
@@ -39,7 +40,7 @@
std::unique_ptr<MediaConstraints> JavaToNativeMediaConstraints(
JNIEnv* env,
const JavaRef<jobject>& j_constraints) {
- return absl::make_unique<MediaConstraints>(
+ return std::make_unique<MediaConstraints>(
PopulateConstraintsFromJavaPairList(
env, Java_MediaConstraints_getMandatory(env, j_constraints)),
PopulateConstraintsFromJavaPairList(
diff --git a/sdk/android/src/jni/pc/media_stream.cc b/sdk/android/src/jni/pc/media_stream.cc
index 6bbeaa7..4779793 100644
--- a/sdk/android/src/jni/pc/media_stream.cc
+++ b/sdk/android/src/jni/pc/media_stream.cc
@@ -10,7 +10,8 @@
#include "sdk/android/src/jni/pc/media_stream.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/android/generated_peerconnection_jni/MediaStream_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
@@ -25,7 +26,7 @@
env,
Java_MediaStream_Constructor(env,
jlongFromPointer(media_stream.get()))),
- observer_(absl::make_unique<MediaStreamObserver>(media_stream)) {
+ observer_(std::make_unique<MediaStreamObserver>(media_stream)) {
for (rtc::scoped_refptr<AudioTrackInterface> track :
media_stream->GetAudioTracks()) {
Java_MediaStream_addNativeAudioTrack(env, j_media_stream_,
diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc
index 13f8301..20804de 100644
--- a/sdk/android/src/jni/pc/peer_connection.cc
+++ b/sdk/android/src/jni/pc/peer_connection.cc
@@ -32,7 +32,6 @@
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/peer_connection_interface.h"
#include "api/rtc_event_log_output_file.h"
#include "api/rtp_receiver_interface.h"
@@ -786,7 +785,7 @@
return false;
}
return ExtractNativePC(jni, j_pc)->StartRtcEventLog(
- absl::make_unique<RtcEventLogOutputFile>(f, max_size));
+ std::make_unique<RtcEventLogOutputFile>(f, max_size));
}
static void JNI_PeerConnection_StopRtcEventLog(
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.cc b/sdk/android/src/jni/pc/peer_connection_factory.cc
index 1446576..4ae6faf 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.cc
+++ b/sdk/android/src/jni/pc/peer_connection_factory.cc
@@ -204,7 +204,7 @@
field_trial::InitFieldTrialsFromString(nullptr);
return;
}
- field_trials_init_string = absl::make_unique<std::string>(
+ field_trials_init_string = std::make_unique<std::string>(
JavaToNativeString(jni, j_trials_init_string));
RTC_LOG(LS_INFO) << "initializeFieldTrials: " << *field_trials_init_string;
field_trial::InitFieldTrialsFromString(field_trials_init_string->c_str());
@@ -302,7 +302,7 @@
dependencies.signaling_thread = signaling_thread.get();
dependencies.task_queue_factory = CreateDefaultTaskQueueFactory();
dependencies.call_factory = CreateCallFactory();
- dependencies.event_log_factory = absl::make_unique<RtcEventLogFactory>(
+ dependencies.event_log_factory = std::make_unique<RtcEventLogFactory>(
dependencies.task_queue_factory.get());
dependencies.fec_controller_factory = std::move(fec_controller_factory);
dependencies.network_controller_factory =
@@ -476,7 +476,7 @@
PeerConnectionDependencies peer_connection_dependencies(observer.get());
if (!j_sslCertificateVerifier.is_null()) {
peer_connection_dependencies.tls_cert_verifier =
- absl::make_unique<SSLCertificateVerifierWrapper>(
+ std::make_unique<SSLCertificateVerifierWrapper>(
jni, j_sslCertificateVerifier);
}
@@ -531,7 +531,7 @@
if (jni_log_sink) {
rtc::LogMessage::RemoveLogToStream(jni_log_sink.get());
}
- jni_log_sink = absl::make_unique<JNILogSink>(jni, j_logging);
+ jni_log_sink = std::make_unique<JNILogSink>(jni, j_logging);
rtc::LogMessage::AddLogToStream(
jni_log_sink.get(), static_cast<rtc::LoggingSeverity>(nativeSeverity));
rtc::LogMessage::LogToDebug(rtc::LS_NONE);
diff --git a/sdk/objc/api/peerconnection/RTCFileLogger.mm b/sdk/objc/api/peerconnection/RTCFileLogger.mm
index ef13023..2532fcf 100644
--- a/sdk/objc/api/peerconnection/RTCFileLogger.mm
+++ b/sdk/objc/api/peerconnection/RTCFileLogger.mm
@@ -132,11 +132,11 @@
std::unique_ptr<rtc::FileRotatingStreamReader> stream;
switch(_rotationType) {
case RTCFileLoggerTypeApp:
- stream = absl::make_unique<rtc::FileRotatingStreamReader>(_dirPath.UTF8String,
- kRTCFileLoggerRotatingLogPrefix);
+ stream = std::make_unique<rtc::FileRotatingStreamReader>(_dirPath.UTF8String,
+ kRTCFileLoggerRotatingLogPrefix);
break;
case RTCFileLoggerTypeCall:
- stream = absl::make_unique<rtc::CallSessionFileRotatingStreamReader>(_dirPath.UTF8String);
+ stream = std::make_unique<rtc::CallSessionFileRotatingStreamReader>(_dirPath.UTF8String);
break;
}
size_t bufferSize = stream->GetSize();
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
index 097eeb4..32a8a4b 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
@@ -236,11 +236,11 @@
void PeerConnectionDelegateAdapter::OnIceSelectedCandidatePairChanged(
const cricket::CandidatePairChangeEvent &event) {
const auto &selected_pair = event.selected_candidate_pair;
- auto local_candidate_wrapper = absl::make_unique<JsepIceCandidate>(
+ auto local_candidate_wrapper = std::make_unique<JsepIceCandidate>(
selected_pair.local_candidate().transport_name(), -1, selected_pair.local_candidate());
RTCIceCandidate *local_candidate =
[[RTCIceCandidate alloc] initWithNativeCandidate:local_candidate_wrapper.release()];
- auto remote_candidate_wrapper = absl::make_unique<JsepIceCandidate>(
+ auto remote_candidate_wrapper = std::make_unique<JsepIceCandidate>(
selected_pair.remote_candidate().transport_name(), -1, selected_pair.remote_candidate());
RTCIceCandidate *remote_candidate =
[[RTCIceCandidate alloc] initWithNativeCandidate:remote_candidate_wrapper.release()];
@@ -563,7 +563,7 @@
rtc::saturated_cast<size_t>(maxSizeInBytes);
_hasStartedRtcEventLog = _peerConnection->StartRtcEventLog(
- absl::make_unique<webrtc::RtcEventLogOutputFile>(f, max_size));
+ std::make_unique<webrtc::RtcEventLogOutputFile>(f, max_size));
return _hasStartedRtcEventLog;
}
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
index d63c08e..4ac33d2 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
+
#import "RTCPeerConnectionFactory+Native.h"
#import "RTCPeerConnectionFactory+Private.h"
#import "RTCPeerConnectionFactoryOptions+Private.h"
@@ -28,7 +30,6 @@
#import "components/video_codec/RTCVideoEncoderFactoryH264.h"
// The no-media version PeerConnectionFactory doesn't depend on these files, but the gn check tool
// is not smart enough to take the #ifdef into account.
-#include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h" // nogncheck
#include "api/audio_codecs/builtin_audio_encoder_factory.h" // nogncheck
#include "api/rtc_event_log/rtc_event_log_factory.h"
@@ -51,7 +52,6 @@
// C++ target.
// TODO(zhihuang): Remove nogncheck once MediaEngineInterface is moved to C++
// API layer.
-#include "absl/memory/memory.h"
#include "api/transport/media/media_transport_interface.h"
#include "media/engine/webrtc_media_engine.h" // nogncheck
@@ -231,7 +231,7 @@
dependencies.media_engine = cricket::CreateMediaEngine(std::move(media_deps));
dependencies.call_factory = webrtc::CreateCallFactory();
dependencies.event_log_factory =
- absl::make_unique<webrtc::RtcEventLogFactory>(dependencies.task_queue_factory.get());
+ std::make_unique<webrtc::RtcEventLogFactory>(dependencies.task_queue_factory.get());
dependencies.network_controller_factory = std::move(networkControllerFactory);
dependencies.media_transport_factory = std::move(mediaTransportFactory);
#endif
diff --git a/sdk/objc/native/api/video_decoder_factory.mm b/sdk/objc/native/api/video_decoder_factory.mm
index a4f9a20..8d0e4ab 100644
--- a/sdk/objc/native/api/video_decoder_factory.mm
+++ b/sdk/objc/native/api/video_decoder_factory.mm
@@ -10,14 +10,15 @@
#include "sdk/objc/native/api/video_decoder_factory.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/objc/native/src/objc_video_decoder_factory.h"
namespace webrtc {
std::unique_ptr<VideoDecoderFactory> ObjCToNativeVideoDecoderFactory(
id<RTCVideoDecoderFactory> objc_video_decoder_factory) {
- return absl::make_unique<ObjCVideoDecoderFactory>(objc_video_decoder_factory);
+ return std::make_unique<ObjCVideoDecoderFactory>(objc_video_decoder_factory);
}
} // namespace webrtc
diff --git a/sdk/objc/native/api/video_encoder_factory.mm b/sdk/objc/native/api/video_encoder_factory.mm
index 0f4a57c..b582deb 100644
--- a/sdk/objc/native/api/video_encoder_factory.mm
+++ b/sdk/objc/native/api/video_encoder_factory.mm
@@ -10,14 +10,15 @@
#include "sdk/objc/native/api/video_encoder_factory.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/objc/native/src/objc_video_encoder_factory.h"
namespace webrtc {
std::unique_ptr<VideoEncoderFactory> ObjCToNativeVideoEncoderFactory(
id<RTCVideoEncoderFactory> objc_video_encoder_factory) {
- return absl::make_unique<ObjCVideoEncoderFactory>(objc_video_encoder_factory);
+ return std::make_unique<ObjCVideoEncoderFactory>(objc_video_encoder_factory);
}
} // namespace webrtc
diff --git a/sdk/objc/native/api/video_renderer.mm b/sdk/objc/native/api/video_renderer.mm
index ce36c34..6631685 100644
--- a/sdk/objc/native/api/video_renderer.mm
+++ b/sdk/objc/native/api/video_renderer.mm
@@ -10,14 +10,15 @@
#include "sdk/objc/native/api/video_renderer.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "sdk/objc/native/src/objc_video_renderer.h"
namespace webrtc {
std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> ObjCToNativeVideoRenderer(
id<RTCVideoRenderer> objc_video_renderer) {
- return absl::make_unique<ObjCVideoRenderer>(objc_video_renderer);
+ return std::make_unique<ObjCVideoRenderer>(objc_video_renderer);
}
} // namespace webrtc