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/api/test/create_network_emulation_manager.cc b/api/test/create_network_emulation_manager.cc
index 7a9cb04..72efec2 100644
--- a/api/test/create_network_emulation_manager.cc
+++ b/api/test/create_network_emulation_manager.cc
@@ -11,13 +11,14 @@
#include "api/test/create_network_emulation_manager.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "test/network/network_emulation_manager.h"
namespace webrtc {
std::unique_ptr<NetworkEmulationManager> CreateNetworkEmulationManager() {
- return absl::make_unique<test::NetworkEmulationManagerImpl>();
+ return std::make_unique<test::NetworkEmulationManagerImpl>();
}
} // namespace webrtc
diff --git a/api/test/create_peerconnection_quality_test_fixture.cc b/api/test/create_peerconnection_quality_test_fixture.cc
index 9be5439..1e027bf 100644
--- a/api/test/create_peerconnection_quality_test_fixture.cc
+++ b/api/test/create_peerconnection_quality_test_fixture.cc
@@ -10,9 +10,9 @@
#include "api/test/create_peerconnection_quality_test_fixture.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "test/pc/e2e/peer_connection_quality_test.h"
namespace webrtc {
@@ -23,7 +23,7 @@
std::string test_case_name,
std::unique_ptr<AudioQualityAnalyzerInterface> audio_quality_analyzer,
std::unique_ptr<VideoQualityAnalyzerInterface> video_quality_analyzer) {
- return absl::make_unique<PeerConnectionE2EQualityTest>(
+ return std::make_unique<PeerConnectionE2EQualityTest>(
std::move(test_case_name), std::move(audio_quality_analyzer),
std::move(video_quality_analyzer));
}
diff --git a/api/test/create_simulcast_test_fixture.cc b/api/test/create_simulcast_test_fixture.cc
index 897746d..024145d 100644
--- a/api/test/create_simulcast_test_fixture.cc
+++ b/api/test/create_simulcast_test_fixture.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/test/simulcast_test_fixture.h"
#include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
@@ -24,7 +23,7 @@
std::unique_ptr<VideoEncoderFactory> encoder_factory,
std::unique_ptr<VideoDecoderFactory> decoder_factory,
SdpVideoFormat video_format) {
- return absl::make_unique<SimulcastTestFixtureImpl>(
+ return std::make_unique<SimulcastTestFixtureImpl>(
std::move(encoder_factory), std::move(decoder_factory), video_format);
}
diff --git a/api/test/create_video_quality_test_fixture.cc b/api/test/create_video_quality_test_fixture.cc
index ee63435..1fa7d24 100644
--- a/api/test/create_video_quality_test_fixture.cc
+++ b/api/test/create_video_quality_test_fixture.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "video/video_quality_test.h"
namespace webrtc {
@@ -21,21 +20,21 @@
std::unique_ptr<VideoQualityTestFixtureInterface>
CreateVideoQualityTestFixture() {
// By default, we don't override the FEC module, so pass an empty factory.
- return absl::make_unique<VideoQualityTest>(nullptr);
+ return std::make_unique<VideoQualityTest>(nullptr);
}
std::unique_ptr<VideoQualityTestFixtureInterface> CreateVideoQualityTestFixture(
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory) {
- auto components = absl::make_unique<
- VideoQualityTestFixtureInterface::InjectionComponents>();
+ auto components =
+ std::make_unique<VideoQualityTestFixtureInterface::InjectionComponents>();
components->fec_controller_factory = std::move(fec_controller_factory);
- return absl::make_unique<VideoQualityTest>(std::move(components));
+ return std::make_unique<VideoQualityTest>(std::move(components));
}
std::unique_ptr<VideoQualityTestFixtureInterface> CreateVideoQualityTestFixture(
std::unique_ptr<VideoQualityTestFixtureInterface::InjectionComponents>
components) {
- return absl::make_unique<VideoQualityTest>(std::move(components));
+ return std::make_unique<VideoQualityTest>(std::move(components));
}
} // namespace webrtc
diff --git a/api/test/create_videocodec_test_fixture.cc b/api/test/create_videocodec_test_fixture.cc
index df8ad8b..1f618e5 100644
--- a/api/test/create_videocodec_test_fixture.cc
+++ b/api/test/create_videocodec_test_fixture.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/test/videocodec_test_fixture.h"
#include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
@@ -24,14 +23,14 @@
std::unique_ptr<VideoCodecTestFixture> CreateVideoCodecTestFixture(
const Config& config) {
- return absl::make_unique<VideoCodecTestFixtureImpl>(config);
+ return std::make_unique<VideoCodecTestFixtureImpl>(config);
}
std::unique_ptr<VideoCodecTestFixture> CreateVideoCodecTestFixture(
const Config& config,
std::unique_ptr<VideoDecoderFactory> decoder_factory,
std::unique_ptr<VideoEncoderFactory> encoder_factory) {
- return absl::make_unique<VideoCodecTestFixtureImpl>(
+ return std::make_unique<VideoCodecTestFixtureImpl>(
config, std::move(decoder_factory), std::move(encoder_factory));
}
diff --git a/api/test/fake_media_transport.h b/api/test/fake_media_transport.h
index 3bd4eba..593135d 100644
--- a/api/test/fake_media_transport.h
+++ b/api/test/fake_media_transport.h
@@ -17,7 +17,6 @@
#include <vector>
#include "absl/algorithm/container.h"
-#include "absl/memory/memory.h"
#include "api/test/fake_datagram_transport.h"
#include "api/transport/media/media_transport_interface.h"
@@ -165,7 +164,7 @@
rtc::Thread* network_thread,
const MediaTransportSettings& settings) override {
std::unique_ptr<MediaTransportInterface> media_transport =
- absl::make_unique<FakeMediaTransport>(settings, transport_offer_);
+ std::make_unique<FakeMediaTransport>(settings, transport_offer_);
media_transport->Connect(packet_transport);
return std::move(media_transport);
}
@@ -174,7 +173,7 @@
rtc::Thread* network_thread,
const MediaTransportSettings& settings) override {
std::unique_ptr<MediaTransportInterface> media_transport =
- absl::make_unique<FakeMediaTransport>(
+ std::make_unique<FakeMediaTransport>(
settings, transport_offer_, settings.remote_transport_parameters);
return std::move(media_transport);
}
diff --git a/api/test/loopback_media_transport.cc b/api/test/loopback_media_transport.cc
index 8c7f240..cadcff0 100644
--- a/api/test/loopback_media_transport.cc
+++ b/api/test/loopback_media_transport.cc
@@ -10,8 +10,9 @@
#include "api/test/loopback_media_transport.h"
+#include <memory>
+
#include "absl/algorithm/container.h"
-#include "absl/memory/memory.h"
#include "rtc_base/time_utils.h"
namespace webrtc {
@@ -182,7 +183,7 @@
return wrapped_factory_->CreateMediaTransport(packet_transport,
network_thread, settings);
}
- return {absl::make_unique<WrapperMediaTransport>(wrapped_media_transport_)};
+ return {std::make_unique<WrapperMediaTransport>(wrapped_media_transport_)};
}
RTCErrorOr<std::unique_ptr<DatagramTransportInterface>>
@@ -194,7 +195,7 @@
return wrapped_factory_->CreateDatagramTransport(network_thread, settings);
}
return {
- absl::make_unique<WrapperDatagramTransport>(wrapped_datagram_transport_)};
+ std::make_unique<WrapperDatagramTransport>(wrapped_datagram_transport_)};
}
std::string WrapperMediaTransportFactory::GetTransportName() const {
@@ -216,7 +217,7 @@
if (wrapped_factory_) {
return wrapped_factory_->CreateMediaTransport(network_thread, settings);
}
- return {absl::make_unique<WrapperMediaTransport>(wrapped_media_transport_)};
+ return {std::make_unique<WrapperMediaTransport>(wrapped_media_transport_)};
}
MediaTransportPair::MediaTransportPair(rtc::Thread* thread)
diff --git a/api/test/loopback_media_transport.h b/api/test/loopback_media_transport.h
index e00cc23..1087d9a 100644
--- a/api/test/loopback_media_transport.h
+++ b/api/test/loopback_media_transport.h
@@ -16,7 +16,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/transport/datagram_transport_interface.h"
#include "api/transport/media/media_transport_interface.h"
#include "rtc_base/async_invoker.h"
@@ -98,11 +97,11 @@
}
std::unique_ptr<MediaTransportFactory> first_factory() {
- return absl::make_unique<WrapperMediaTransportFactory>(&first_factory_);
+ return std::make_unique<WrapperMediaTransportFactory>(&first_factory_);
}
std::unique_ptr<MediaTransportFactory> second_factory() {
- return absl::make_unique<WrapperMediaTransportFactory>(&second_factory_);
+ return std::make_unique<WrapperMediaTransportFactory>(&second_factory_);
}
void SetState(MediaTransportState state) {
diff --git a/api/test/neteq_simulator_factory.cc b/api/test/neteq_simulator_factory.cc
index 65dc3a8..112d55a 100644
--- a/api/test/neteq_simulator_factory.cc
+++ b/api/test/neteq_simulator_factory.cc
@@ -10,12 +10,12 @@
#include "api/test/neteq_simulator_factory.h"
+#include <memory>
#include <string>
#include <vector>
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
-#include "absl/memory/memory.h"
#include "modules/audio_coding/neteq/tools/neteq_test_factory.h"
#include "rtc_base/checks.h"
@@ -33,7 +33,7 @@
namespace test {
NetEqSimulatorFactory::NetEqSimulatorFactory()
- : factory_(absl::make_unique<NetEqTestFactory>()) {}
+ : factory_(std::make_unique<NetEqTestFactory>()) {}
NetEqSimulatorFactory::~NetEqSimulatorFactory() = default;
diff --git a/api/test/test_dependency_factory.cc b/api/test/test_dependency_factory.cc
index 4294b1b..e72f55a 100644
--- a/api/test/test_dependency_factory.cc
+++ b/api/test/test_dependency_factory.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/thread_checker.h"
@@ -32,7 +31,7 @@
const TestDependencyFactory& TestDependencyFactory::GetInstance() {
RTC_DCHECK(GetThreadChecker()->IsCurrent());
if (instance_ == nullptr) {
- instance_ = absl::make_unique<TestDependencyFactory>();
+ instance_ = std::make_unique<TestDependencyFactory>();
}
return *instance_;
}
diff --git a/api/test/video/BUILD.gn b/api/test/video/BUILD.gn
index 9b63a4a..a4a0d7b 100644
--- a/api/test/video/BUILD.gn
+++ b/api/test/video/BUILD.gn
@@ -19,6 +19,5 @@
deps = [
"../../../rtc_base:checks",
"../../video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}