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/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index c262f67..c99ed9b 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -182,7 +182,6 @@
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
"//third_party/abseil-cpp/absl/flags:usage",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
]
}
@@ -306,7 +305,6 @@
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_numerics",
"../rtc_base:stringutils",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
]
}
@@ -391,7 +389,6 @@
"../test:test_main",
"../test:test_support",
"//testing/gtest",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/libyuv",
]
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 3fb8c60..0d2c043 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -53,7 +53,6 @@
"../../rtc_base:rtc_task_queue",
"../../rtc_base/synchronization:sequence_checker",
"../../rtc_base/third_party/sigslot",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/rtc_tools/network_tester/packet_sender.cc b/rtc_tools/network_tester/packet_sender.cc
index 71e4e59..b2c6cd9 100644
--- a/rtc_tools/network_tester/packet_sender.cc
+++ b/rtc_tools/network_tester/packet_sender.cc
@@ -15,7 +15,6 @@
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/task_queue/queued_task.h"
@@ -99,9 +98,9 @@
RTC_DCHECK_RUN_ON(&worker_queue_checker_);
sending_ = true;
});
- worker_queue_.PostTask(absl::make_unique<UpdateTestSettingTask>(
- this, absl::make_unique<ConfigReader>(config_file_path_)));
- worker_queue_.PostTask(absl::make_unique<SendPacketTask>(this));
+ worker_queue_.PostTask(std::make_unique<UpdateTestSettingTask>(
+ this, std::make_unique<ConfigReader>(config_file_path_)));
+ worker_queue_.PostTask(std::make_unique<SendPacketTask>(this));
}
void PacketSender::StopSending() {
diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
index 60574ee..126d9ca 100644
--- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
@@ -14,10 +14,10 @@
#include <cmath>
#include <limits>
#include <map>
+#include <memory>
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "api/function_view.h"
#include "api/transport/field_trial_based_config.h"
@@ -1168,7 +1168,7 @@
PointStyle::kHighlight);
LogBasedNetworkControllerSimulation simulation(
- absl::make_unique<GoogCcNetworkControllerFactory>(),
+ std::make_unique<GoogCcNetworkControllerFactory>(),
[&](const NetworkControlUpdate& update, Timestamp at_time) {
if (update.target_rate) {
target_rates.points.emplace_back(
@@ -1275,7 +1275,7 @@
// GoogCcNetworkController since that would lead to duplicate outputs.
AcknowledgedBitrateEstimator acknowledged_bitrate_estimator(
&field_trial_config_,
- absl::make_unique<BitrateEstimator>(&field_trial_config_));
+ std::make_unique<BitrateEstimator>(&field_trial_config_));
#endif // !(BWE_TEST_LOGGING_COMPILE_TIME_ENABLE)
int64_t time_us =
std::min({NextRtpTime(), NextRtcpTime(), NextProcessTime()});
@@ -1880,10 +1880,10 @@
std::unique_ptr<AudioDecoder> MakeAudioDecoder(
const SdpAudioFormat& format,
absl::optional<AudioCodecPairId> codec_pair_id) override {
- auto replacement_file = absl::make_unique<test::ResampleInputAudioFile>(
+ auto replacement_file = std::make_unique<test::ResampleInputAudioFile>(
replacement_file_name_, file_sample_rate_hz_);
replacement_file->set_output_rate_hz(48000);
- return absl::make_unique<test::FakeDecodeFromFile>(
+ return std::make_unique<test::FakeDecodeFromFile>(
std::move(replacement_file), 48000, false);
}
diff --git a/rtc_tools/rtp_generator/rtp_generator.cc b/rtc_tools/rtp_generator/rtp_generator.cc
index cd61d85..f7b691d 100644
--- a/rtc_tools/rtp_generator/rtp_generator.cc
+++ b/rtc_tools/rtp_generator/rtp_generator.cc
@@ -11,9 +11,9 @@
#include "rtc_tools/rtp_generator/rtp_generator.h"
#include <algorithm>
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
@@ -161,7 +161,7 @@
video_decoder_factory_(CreateBuiltinVideoDecoderFactory()),
video_bitrate_allocator_factory_(
CreateBuiltinVideoBitrateAllocatorFactory()),
- event_log_(absl::make_unique<RtcEventLogNull>()),
+ event_log_(std::make_unique<RtcEventLogNull>()),
call_(Call::Create(CallConfig(event_log_.get()))),
task_queue_(CreateDefaultTaskQueueFactory()) {
constexpr int kMinBitrateBps = 30000; // 30 Kbps
@@ -222,7 +222,7 @@
// Setup the fake video stream for this.
std::unique_ptr<test::FrameGeneratorCapturer> frame_generator =
- absl::make_unique<test::FrameGeneratorCapturer>(
+ std::make_unique<test::FrameGeneratorCapturer>(
Clock::GetRealTimeClock(),
test::FrameGenerator::CreateSquareGenerator(
send_config.video_width, send_config.video_height,
diff --git a/rtc_tools/sanitizers_unittest.cc b/rtc_tools/sanitizers_unittest.cc
index 066ac84..b997bf0 100644
--- a/rtc_tools/sanitizers_unittest.cc
+++ b/rtc_tools/sanitizers_unittest.cc
@@ -11,9 +11,9 @@
#include <stddef.h>
#include <stdio.h>
+#include <memory>
#include <random>
-#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/null_socket_server.h"
#include "rtc_base/thread.h"
@@ -84,7 +84,7 @@
class IncrementThread : public Thread {
public:
explicit IncrementThread(int* value)
- : Thread(absl::make_unique<NullSocketServer>()), value_(value) {}
+ : Thread(std::make_unique<NullSocketServer>()), value_(value) {}
void Run() override {
++*value_;