diff options
author | Mirko Bonadei <mbonadei@webrtc.org> | 2019-09-17 17:06:18 +0200 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-09-17 15:47:29 +0000 |
commit | 317a1f09ed232bc16e67f6588ecf1b5deabbf928 (patch) | |
tree | fc0fbae9b5d346dbd3587c25e66aa377dd99f017 /pc/channel_manager_unittest.cc | |
parent | 809198edfff416fce8d75b574a43afab5e67b1cd (diff) | |
download | webrtc-317a1f09ed232bc16e67f6588ecf1b5deabbf928.tar.gz |
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}
Diffstat (limited to 'pc/channel_manager_unittest.cc')
-rw-r--r-- | pc/channel_manager_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pc/channel_manager_unittest.cc b/pc/channel_manager_unittest.cc index e88b09cb4f..ab3b88b76e 100644 --- a/pc/channel_manager_unittest.cc +++ b/pc/channel_manager_unittest.cc @@ -12,7 +12,6 @@ #include <memory> -#include "absl/memory/memory.h" #include "api/rtc_error.h" #include "api/test/fake_media_transport.h" #include "api/transport/media/media_transport_config.h" @@ -66,9 +65,9 @@ class ChannelManagerTest : public ::testing::Test { } std::unique_ptr<webrtc::RtpTransportInternal> CreateDtlsSrtpTransport() { - rtp_dtls_transport_ = absl::make_unique<FakeDtlsTransport>( + rtp_dtls_transport_ = std::make_unique<FakeDtlsTransport>( "fake_dtls_transport", cricket::ICE_CANDIDATE_COMPONENT_RTP); - auto dtls_srtp_transport = absl::make_unique<webrtc::DtlsSrtpTransport>( + auto dtls_srtp_transport = std::make_unique<webrtc::DtlsSrtpTransport>( /*rtcp_mux_required=*/true); dtls_srtp_transport->SetDtlsTransports(rtp_dtls_transport_.get(), /*rtcp_dtls_transport=*/nullptr); |