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/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