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/BUILD.gn b/api/BUILD.gn
index cc092ef..f6885f2 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -59,7 +59,6 @@
"audio_codecs:audio_codecs_api",
"task_queue:default_task_queue_factory",
"video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}
}
@@ -372,7 +371,6 @@
":video_quality_test_fixture_api",
"../rtc_base:checks",
"../rtc_base:thread_checker",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -390,7 +388,6 @@
":scoped_refptr",
":video_quality_test_fixture_api",
"../video:video_quality_test",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -404,7 +401,6 @@
deps = [
":network_emulation_manager_api",
"../test/network:emulated_network",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -421,7 +417,6 @@
":peer_connection_quality_test_fixture_api",
":video_quality_analyzer_api",
"../test/pc/e2e:peerconnection_quality_test",
- "//third_party/abseil-cpp/absl/memory",
]
}
}
@@ -581,7 +576,6 @@
"../rtc_base",
"../rtc_base/system:rtc_export",
"rtc_event_log:rtc_event_log",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -633,7 +627,6 @@
"../rtc_base:checks",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
]
}
@@ -659,7 +652,6 @@
"../modules/video_coding:simulcast_test_fixture_impl",
"../rtc_base:rtc_base_approved",
"video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -693,7 +685,6 @@
"../modules/video_coding:videocodec_test_impl",
"../rtc_base:rtc_base_approved",
"video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -901,7 +892,6 @@
"transport:datagram_transport_interface",
"transport/media:media_transport_interface",
"//third_party/abseil-cpp/absl/algorithm:container",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -919,7 +909,6 @@
"transport:datagram_transport_interface",
"transport/media:media_transport_interface",
"//third_party/abseil-cpp/absl/algorithm:container",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -954,7 +943,6 @@
"task_queue:task_queue_default_factory_unittests",
"units:units_unittests",
"video:video_unittests",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn
index deff5b7..ffc47a9 100644
--- a/api/audio/BUILD.gn
+++ b/api/audio/BUILD.gn
@@ -80,7 +80,6 @@
"../../modules/audio_processing/aec3",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/api/audio/echo_canceller3_factory.cc b/api/audio/echo_canceller3_factory.cc
index bb795c9..cff75de 100644
--- a/api/audio/echo_canceller3_factory.cc
+++ b/api/audio/echo_canceller3_factory.cc
@@ -11,7 +11,6 @@
#include <memory>
-#include "absl/memory/memory.h"
#include "modules/audio_processing/aec3/echo_canceller3.h"
namespace webrtc {
@@ -22,9 +21,9 @@
: config_(config) {}
std::unique_ptr<EchoControl> EchoCanceller3Factory::Create(int sample_rate_hz) {
- return absl::make_unique<EchoCanceller3>(config_, sample_rate_hz,
- /*num_render_channels=*/1,
- /*num_capture_channels=*/1);
+ return std::make_unique<EchoCanceller3>(config_, sample_rate_hz,
+ /*num_render_channels=*/1,
+ /*num_capture_channels=*/1);
}
} // namespace webrtc
diff --git a/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
index 34ec2e4..dff62a0 100644
--- a/api/audio_codecs/L16/BUILD.gn
+++ b/api/audio_codecs/L16/BUILD.gn
@@ -25,7 +25,6 @@
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -43,7 +42,6 @@
"../../../modules/audio_coding:pcm16b",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/api/audio_codecs/L16/audio_decoder_L16.cc b/api/audio_codecs/L16/audio_decoder_L16.cc
index be0c6b5..57c9e76 100644
--- a/api/audio_codecs/L16/audio_decoder_L16.cc
+++ b/api/audio_codecs/L16/audio_decoder_L16.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/L16/audio_decoder_L16.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
@@ -36,7 +37,7 @@
std::unique_ptr<AudioDecoder> AudioDecoderL16::MakeAudioDecoder(
const Config& config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
- return config.IsOk() ? absl::make_unique<AudioDecoderPcm16B>(
+ return config.IsOk() ? std::make_unique<AudioDecoderPcm16B>(
config.sample_rate_hz, config.num_channels)
: nullptr;
}
diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc
index 1bb552b..507c8d7 100644
--- a/api/audio_codecs/L16/audio_encoder_L16.cc
+++ b/api/audio_codecs/L16/audio_encoder_L16.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/L16/audio_encoder_L16.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
@@ -63,7 +64,7 @@
c.num_channels = config.num_channels;
c.frame_size_ms = config.frame_size_ms;
c.payload_type = payload_type;
- return absl::make_unique<AudioEncoderPcm16B>(c);
+ return std::make_unique<AudioEncoderPcm16B>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/g711/BUILD.gn b/api/audio_codecs/g711/BUILD.gn
index 3b8f23c..ebcc249 100644
--- a/api/audio_codecs/g711/BUILD.gn
+++ b/api/audio_codecs/g711/BUILD.gn
@@ -25,7 +25,6 @@
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -43,7 +42,6 @@
"../../../modules/audio_coding:g711",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/api/audio_codecs/g711/audio_decoder_g711.cc b/api/audio_codecs/g711/audio_decoder_g711.cc
index 91599c4..57e3741 100644
--- a/api/audio_codecs/g711/audio_decoder_g711.cc
+++ b/api/audio_codecs/g711/audio_decoder_g711.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
#include "rtc_base/numerics/safe_conversions.h"
@@ -49,9 +48,9 @@
RTC_DCHECK(config.IsOk());
switch (config.type) {
case Config::Type::kPcmU:
- return absl::make_unique<AudioDecoderPcmU>(config.num_channels);
+ return std::make_unique<AudioDecoderPcmU>(config.num_channels);
case Config::Type::kPcmA:
- return absl::make_unique<AudioDecoderPcmA>(config.num_channels);
+ return std::make_unique<AudioDecoderPcmA>(config.num_channels);
default:
return nullptr;
}
diff --git a/api/audio_codecs/g711/audio_encoder_g711.cc b/api/audio_codecs/g711/audio_encoder_g711.cc
index f40cd6e..ab95ad4 100644
--- a/api/audio_codecs/g711/audio_encoder_g711.cc
+++ b/api/audio_codecs/g711/audio_encoder_g711.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
#include "rtc_base/numerics/safe_conversions.h"
@@ -70,14 +69,14 @@
impl_config.num_channels = config.num_channels;
impl_config.frame_size_ms = config.frame_size_ms;
impl_config.payload_type = payload_type;
- return absl::make_unique<AudioEncoderPcmU>(impl_config);
+ return std::make_unique<AudioEncoderPcmU>(impl_config);
}
case Config::Type::kPcmA: {
AudioEncoderPcmA::Config impl_config;
impl_config.num_channels = config.num_channels;
impl_config.frame_size_ms = config.frame_size_ms;
impl_config.payload_type = payload_type;
- return absl::make_unique<AudioEncoderPcmA>(impl_config);
+ return std::make_unique<AudioEncoderPcmA>(impl_config);
}
default: {
return nullptr;
diff --git a/api/audio_codecs/g722/BUILD.gn b/api/audio_codecs/g722/BUILD.gn
index e4321d2..ccb4801 100644
--- a/api/audio_codecs/g722/BUILD.gn
+++ b/api/audio_codecs/g722/BUILD.gn
@@ -33,7 +33,6 @@
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -51,7 +50,6 @@
"../../../modules/audio_coding:g722",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/api/audio_codecs/g722/audio_decoder_g722.cc b/api/audio_codecs/g722/audio_decoder_g722.cc
index 2cc16c3..29b6d5d 100644
--- a/api/audio_codecs/g722/audio_decoder_g722.cc
+++ b/api/audio_codecs/g722/audio_decoder_g722.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/g722/audio_decoder_g722.h"
#include "rtc_base/numerics/safe_conversions.h"
@@ -40,9 +39,9 @@
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
switch (config.num_channels) {
case 1:
- return absl::make_unique<AudioDecoderG722Impl>();
+ return std::make_unique<AudioDecoderG722Impl>();
case 2:
- return absl::make_unique<AudioDecoderG722StereoImpl>();
+ return std::make_unique<AudioDecoderG722StereoImpl>();
default:
return nullptr;
}
diff --git a/api/audio_codecs/g722/audio_encoder_g722.cc b/api/audio_codecs/g722/audio_encoder_g722.cc
index 6374ae8..12c1746 100644
--- a/api/audio_codecs/g722/audio_encoder_g722.cc
+++ b/api/audio_codecs/g722/audio_encoder_g722.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/g722/audio_encoder_g722.h"
#include "rtc_base/numerics/safe_conversions.h"
@@ -62,7 +61,7 @@
int payload_type,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
RTC_DCHECK(config.IsOk());
- return absl::make_unique<AudioEncoderG722Impl>(config, payload_type);
+ return std::make_unique<AudioEncoderG722Impl>(config, payload_type);
}
} // namespace webrtc
diff --git a/api/audio_codecs/ilbc/BUILD.gn b/api/audio_codecs/ilbc/BUILD.gn
index d766fa4..559ae2b 100644
--- a/api/audio_codecs/ilbc/BUILD.gn
+++ b/api/audio_codecs/ilbc/BUILD.gn
@@ -32,7 +32,6 @@
"../../../modules/audio_coding:ilbc",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:safe_minmax",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -49,7 +48,6 @@
"..:audio_codecs_api",
"../../../modules/audio_coding:ilbc",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/api/audio_codecs/ilbc/audio_decoder_ilbc.cc b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
index 4a00f8d..d0aae90 100644
--- a/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
+++ b/api/audio_codecs/ilbc/audio_decoder_ilbc.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
@@ -35,7 +34,7 @@
std::unique_ptr<AudioDecoder> AudioDecoderIlbc::MakeAudioDecoder(
Config config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
- return absl::make_unique<AudioDecoderIlbcImpl>();
+ return std::make_unique<AudioDecoderIlbcImpl>();
}
} // namespace webrtc
diff --git a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
index 896ed23..bd653b7 100644
--- a/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
+++ b/api/audio_codecs/ilbc/audio_encoder_ilbc.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
#include "rtc_base/numerics/safe_conversions.h"
@@ -76,7 +75,7 @@
int payload_type,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
RTC_DCHECK(config.IsOk());
- return absl::make_unique<AudioEncoderIlbcImpl>(config, payload_type);
+ return std::make_unique<AudioEncoderIlbcImpl>(config, payload_type);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/BUILD.gn b/api/audio_codecs/isac/BUILD.gn
index c7d6e43..d558d20 100644
--- a/api/audio_codecs/isac/BUILD.gn
+++ b/api/audio_codecs/isac/BUILD.gn
@@ -79,7 +79,6 @@
"..:audio_codecs_api",
"../../../modules/audio_coding:isac_fix",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -96,7 +95,6 @@
"..:audio_codecs_api",
"../../../modules/audio_coding:isac_fix",
"../../../rtc_base:rtc_base_approved",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -114,7 +112,6 @@
"../../../modules/audio_coding:isac",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -132,7 +129,6 @@
"../../../modules/audio_coding:isac",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/api/audio_codecs/isac/audio_decoder_isac_fix.cc b/api/audio_codecs/isac/audio_decoder_isac_fix.cc
index 0e2d6bc..21d0da3 100644
--- a/api/audio_codecs/isac/audio_decoder_isac_fix.cc
+++ b/api/audio_codecs/isac/audio_decoder_isac_fix.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/isac/audio_decoder_isac_fix.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
@@ -34,7 +35,7 @@
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
AudioDecoderIsacFixImpl::Config c;
c.sample_rate_hz = 16000;
- return absl::make_unique<AudioDecoderIsacFixImpl>(c);
+ return std::make_unique<AudioDecoderIsacFixImpl>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/audio_decoder_isac_float.cc b/api/audio_codecs/isac/audio_decoder_isac_float.cc
index ec774eb..4efc2ea 100644
--- a/api/audio_codecs/isac/audio_decoder_isac_float.cc
+++ b/api/audio_codecs/isac/audio_decoder_isac_float.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/isac/audio_decoder_isac_float.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
@@ -41,7 +42,7 @@
RTC_DCHECK(config.IsOk());
AudioDecoderIsacFloatImpl::Config c;
c.sample_rate_hz = config.sample_rate_hz;
- return absl::make_unique<AudioDecoderIsacFloatImpl>(c);
+ return std::make_unique<AudioDecoderIsacFloatImpl>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/audio_encoder_isac_fix.cc b/api/audio_codecs/isac/audio_encoder_isac_fix.cc
index a10d1ee..7bcb78e 100644
--- a/api/audio_codecs/isac/audio_encoder_isac_fix.cc
+++ b/api/audio_codecs/isac/audio_encoder_isac_fix.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/isac/audio_encoder_isac_fix.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
#include "rtc_base/string_to_number.h"
@@ -56,7 +57,7 @@
AudioEncoderIsacFixImpl::Config c;
c.frame_size_ms = config.frame_size_ms;
c.payload_type = payload_type;
- return absl::make_unique<AudioEncoderIsacFixImpl>(c);
+ return std::make_unique<AudioEncoderIsacFixImpl>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/isac/audio_encoder_isac_float.cc b/api/audio_codecs/isac/audio_encoder_isac_float.cc
index 37982b1..6f684c8 100644
--- a/api/audio_codecs/isac/audio_encoder_isac_float.cc
+++ b/api/audio_codecs/isac/audio_encoder_isac_float.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/isac/audio_encoder_isac_float.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
#include "rtc_base/string_to_number.h"
@@ -70,7 +71,7 @@
c.sample_rate_hz = config.sample_rate_hz;
c.frame_size_ms = config.frame_size_ms;
c.bit_rate = config.bit_rate;
- return absl::make_unique<AudioEncoderIsacFloatImpl>(c);
+ return std::make_unique<AudioEncoderIsacFloatImpl>(c);
}
} // namespace webrtc
diff --git a/api/audio_codecs/opus/BUILD.gn b/api/audio_codecs/opus/BUILD.gn
index 01a4884..35c3cbf 100644
--- a/api/audio_codecs/opus/BUILD.gn
+++ b/api/audio_codecs/opus/BUILD.gn
@@ -72,7 +72,6 @@
"../../../modules/audio_coding:webrtc_opus",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
diff --git a/api/audio_codecs/opus/audio_decoder_opus.cc b/api/audio_codecs/opus/audio_decoder_opus.cc
index 82bb1b2..6b4e0d3 100644
--- a/api/audio_codecs/opus/audio_decoder_opus.cc
+++ b/api/audio_codecs/opus/audio_decoder_opus.cc
@@ -14,7 +14,6 @@
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h"
@@ -73,8 +72,8 @@
Config config,
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
RTC_DCHECK(config.IsOk());
- return absl::make_unique<AudioDecoderOpusImpl>(config.num_channels,
- config.sample_rate_hz);
+ return std::make_unique<AudioDecoderOpusImpl>(config.num_channels,
+ config.sample_rate_hz);
}
} // namespace webrtc
diff --git a/api/audio_codecs/test/BUILD.gn b/api/audio_codecs/test/BUILD.gn
index cc7a4d9..61234f5 100644
--- a/api/audio_codecs/test/BUILD.gn
+++ b/api/audio_codecs/test/BUILD.gn
@@ -38,7 +38,6 @@
"../isac:audio_encoder_isac_float",
"../opus:audio_decoder_opus",
"../opus:audio_encoder_opus",
- "//third_party/abseil-cpp/absl/memory",
]
}
}
diff --git a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
index fc7cc7f..0e2e8c2 100644
--- a/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
+++ b/api/audio_codecs/test/audio_decoder_factory_template_unittest.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/audio_decoder_factory_template.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/audio_codecs/L16/audio_decoder_L16.h"
#include "api/audio_codecs/g711/audio_decoder_g711.h"
#include "api/audio_codecs/g722/audio_decoder_g722.h"
@@ -65,7 +66,7 @@
static std::unique_ptr<AudioDecoder> MakeAudioDecoder(
const Config&,
absl::optional<AudioCodecPairId> /*codec_pair_id*/ = absl::nullopt) {
- auto dec = absl::make_unique<testing::StrictMock<MockAudioDecoder>>();
+ auto dec = std::make_unique<testing::StrictMock<MockAudioDecoder>>();
EXPECT_CALL(*dec, SampleRateHz())
.WillOnce(::testing::Return(Params::CodecInfo().sample_rate_hz));
EXPECT_CALL(*dec, Die());
diff --git a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
index b1a5a51..95ea855 100644
--- a/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
+++ b/api/audio_codecs/test/audio_encoder_factory_template_unittest.cc
@@ -10,7 +10,8 @@
#include "api/audio_codecs/audio_encoder_factory_template.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/audio_codecs/L16/audio_encoder_L16.h"
#include "api/audio_codecs/g711/audio_encoder_g711.h"
#include "api/audio_codecs/g722/audio_encoder_g722.h"
@@ -66,7 +67,7 @@
const Config&,
int payload_type,
absl::optional<AudioCodecPairId> /*codec_pair_id*/ = absl::nullopt) {
- auto enc = absl::make_unique<testing::StrictMock<MockAudioEncoder>>();
+ auto enc = std::make_unique<testing::StrictMock<MockAudioEncoder>>();
EXPECT_CALL(*enc, SampleRateHz())
.WillOnce(::testing::Return(Params::CodecInfo().sample_rate_hz));
return std::move(enc);
diff --git a/api/create_peerconnection_factory.cc b/api/create_peerconnection_factory.cc
index ff08ec8..6223150 100644
--- a/api/create_peerconnection_factory.cc
+++ b/api/create_peerconnection_factory.cc
@@ -10,9 +10,9 @@
#include "api/create_peerconnection_factory.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/call/call_factory_interface.h"
#include "api/peer_connection_interface.h"
#include "api/rtc_event_log/rtc_event_log_factory.h"
@@ -43,7 +43,7 @@
dependencies.signaling_thread = signaling_thread;
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());
cricket::MediaEngineDependencies media_dependencies;
diff --git a/api/ice_transport_factory.cc b/api/ice_transport_factory.cc
index 1fb917d..c32d7d2 100644
--- a/api/ice_transport_factory.cc
+++ b/api/ice_transport_factory.cc
@@ -13,7 +13,6 @@
#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "p2p/base/ice_transport_internal.h"
#include "p2p/base/p2p_transport_channel.h"
#include "p2p/base/port_allocator.h"
@@ -59,7 +58,7 @@
rtc::scoped_refptr<IceTransportInterface> CreateIceTransport(
IceTransportInit init) {
return new rtc::RefCountedObject<IceTransportWithTransportChannel>(
- absl::make_unique<cricket::P2PTransportChannel>(
+ std::make_unique<cricket::P2PTransportChannel>(
"", 0, init.port_allocator(), init.async_resolver_factory(),
init.event_log()));
}
diff --git a/api/rtc_event_log/BUILD.gn b/api/rtc_event_log/BUILD.gn
index c04ca64..e420190 100644
--- a/api/rtc_event_log/BUILD.gn
+++ b/api/rtc_event_log/BUILD.gn
@@ -37,7 +37,6 @@
":rtc_event_log",
"../../rtc_base:checks",
"../task_queue",
- "//third_party/abseil-cpp/absl/memory",
]
if (rtc_enable_protobuf) {
diff --git a/api/rtc_event_log/rtc_event_log_factory.cc b/api/rtc_event_log/rtc_event_log_factory.cc
index da03e93..f88997b 100644
--- a/api/rtc_event_log/rtc_event_log_factory.cc
+++ b/api/rtc_event_log/rtc_event_log_factory.cc
@@ -10,9 +10,9 @@
#include "api/rtc_event_log/rtc_event_log_factory.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#ifdef ENABLE_RTC_EVENT_LOG
@@ -29,9 +29,9 @@
std::unique_ptr<RtcEventLog> RtcEventLogFactory::CreateRtcEventLog(
RtcEventLog::EncodingType encoding_type) {
#ifdef ENABLE_RTC_EVENT_LOG
- return absl::make_unique<RtcEventLogImpl>(encoding_type, task_queue_factory_);
+ return std::make_unique<RtcEventLogImpl>(encoding_type, task_queue_factory_);
#else
- return absl::make_unique<RtcEventLogNull>();
+ return std::make_unique<RtcEventLogNull>();
#endif
}
diff --git a/api/rtc_event_log_output_file_unittest.cc b/api/rtc_event_log_output_file_unittest.cc
index bffda0c..071909b 100644
--- a/api/rtc_event_log_output_file_unittest.cc
+++ b/api/rtc_event_log_output_file_unittest.cc
@@ -15,7 +15,6 @@
#include <memory>
#include <string>
-#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
@@ -52,14 +51,13 @@
};
TEST_F(RtcEventLogOutputFileTest, NonDefectiveOutputsStartOutActive) {
- auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_);
+ auto output_file = std::make_unique<RtcEventLogOutputFile>(output_file_name_);
EXPECT_TRUE(output_file->IsActive());
}
TEST_F(RtcEventLogOutputFileTest, DefectiveOutputsStartOutInactive) {
const std::string illegal_filename = "/////////";
- auto output_file = absl::make_unique<RtcEventLogOutputFile>(illegal_filename);
+ auto output_file = std::make_unique<RtcEventLogOutputFile>(illegal_filename);
EXPECT_FALSE(output_file->IsActive());
}
@@ -67,8 +65,7 @@
TEST_F(RtcEventLogOutputFileTest, UnlimitedOutputFile) {
const std::string output_str = "one two three";
- auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_);
+ auto output_file = std::make_unique<RtcEventLogOutputFile>(output_file_name_);
output_file->Write(output_str);
output_file.reset(); // Closing the file flushes the buffer to disk.
@@ -79,7 +76,7 @@
TEST_F(RtcEventLogOutputFileTest, LimitedOutputFileCappedToCapacity) {
// Fit two bytes, then the third should be rejected.
auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_, 2);
+ std::make_unique<RtcEventLogOutputFile>(output_file_name_, 2);
output_file->Write("1");
output_file->Write("2");
@@ -99,7 +96,7 @@
// Set a file size limit just shy of fitting the entire second line.
const size_t size_limit = output_str_1.length() + output_str_2.length() - 1;
auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_, size_limit);
+ std::make_unique<RtcEventLogOutputFile>(output_file_name_, size_limit);
output_file->Write(output_str_1);
output_file->Write(output_str_2);
@@ -110,20 +107,20 @@
TEST_F(RtcEventLogOutputFileTest, UnsuccessfulWriteReturnsFalse) {
auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_, 2);
+ std::make_unique<RtcEventLogOutputFile>(output_file_name_, 2);
EXPECT_FALSE(output_file->Write("abc"));
}
TEST_F(RtcEventLogOutputFileTest, SuccessfulWriteReturnsTrue) {
auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_, 3);
+ std::make_unique<RtcEventLogOutputFile>(output_file_name_, 3);
EXPECT_TRUE(output_file->Write("abc"));
}
// Even if capacity is reached, a successful write leaves the output active.
TEST_F(RtcEventLogOutputFileTest, FileStillActiveAfterSuccessfulWrite) {
auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_, 3);
+ std::make_unique<RtcEventLogOutputFile>(output_file_name_, 3);
ASSERT_TRUE(output_file->Write("abc"));
EXPECT_TRUE(output_file->IsActive());
}
@@ -132,13 +129,13 @@
// not yet been reached.
TEST_F(RtcEventLogOutputFileTest, FileInactiveAfterUnsuccessfulWrite) {
auto output_file =
- absl::make_unique<RtcEventLogOutputFile>(output_file_name_, 2);
+ std::make_unique<RtcEventLogOutputFile>(output_file_name_, 2);
ASSERT_FALSE(output_file->Write("abc"));
EXPECT_FALSE(output_file->IsActive());
}
TEST_F(RtcEventLogOutputFileTest, AllowReasonableFileSizeLimits) {
- auto output_file = absl::make_unique<RtcEventLogOutputFile>(
+ auto output_file = std::make_unique<RtcEventLogOutputFile>(
output_file_name_, RtcEventLogOutputFile::kMaxReasonableFileSize);
EXPECT_TRUE(output_file->IsActive());
}
@@ -158,8 +155,8 @@
auto create_output_file = [&] {
const size_t unreasonable_size =
RtcEventLogOutputFile::kMaxReasonableFileSize + 1;
- output_file = absl::make_unique<RtcEventLogOutputFile>(output_file_name_,
- unreasonable_size);
+ output_file = std::make_unique<RtcEventLogOutputFile>(output_file_name_,
+ unreasonable_size);
};
EXPECT_DEATH(create_output_file(), "");
}
diff --git a/api/task_queue/task_queue_test.cc b/api/task_queue/task_queue_test.cc
index 31cf31e..a8a799f 100644
--- a/api/task_queue/task_queue_test.cc
+++ b/api/task_queue/task_queue_test.cc
@@ -182,7 +182,7 @@
};
auto task =
- absl::make_unique<ReusedTask>(&call_count, reply_queue.get(), &event);
+ std::make_unique<ReusedTask>(&call_count, reply_queue.get(), &event);
post_queue->PostTask(std::move(task));
EXPECT_TRUE(event.Wait(1000));
}
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",
]
}
diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index c4d6338..12bcf09 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -99,7 +99,6 @@
"..:network_state_predictor_api",
"../../modules/congestion_controller/goog_cc",
"../../rtc_base:deprecation",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -125,7 +124,6 @@
":network_control",
":test_feedback_generator_interface",
"../../test/network:feedback_generator",
- "//third_party/abseil-cpp/absl/memory",
]
}
}
diff --git a/api/transport/goog_cc_factory.cc b/api/transport/goog_cc_factory.cc
index 2187da3..ccadb8b 100644
--- a/api/transport/goog_cc_factory.cc
+++ b/api/transport/goog_cc_factory.cc
@@ -10,9 +10,9 @@
#include "api/transport/goog_cc_factory.h"
+#include <memory>
#include <utility>
-#include "absl/memory/memory.h"
#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"
namespace webrtc {
@@ -47,8 +47,8 @@
factory_config_.network_state_predictor_factory
->CreateNetworkStatePredictor();
}
- return absl::make_unique<GoogCcNetworkController>(config,
- std::move(goog_cc_config));
+ return std::make_unique<GoogCcNetworkController>(config,
+ std::move(goog_cc_config));
}
TimeDelta GoogCcNetworkControllerFactory::GetProcessInterval() const {
diff --git a/api/transport/test/create_feedback_generator.cc b/api/transport/test/create_feedback_generator.cc
index 01e0fae..7c83823 100644
--- a/api/transport/test/create_feedback_generator.cc
+++ b/api/transport/test/create_feedback_generator.cc
@@ -9,14 +9,15 @@
*/
#include "api/transport/test/create_feedback_generator.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "test/network/feedback_generator.h"
namespace webrtc {
std::unique_ptr<FeedbackGenerator> CreateFeedbackGenerator(
FeedbackGenerator::Config confg) {
- return absl::make_unique<FeedbackGeneratorImpl>(confg);
+ return std::make_unique<FeedbackGeneratorImpl>(confg);
}
} // namespace webrtc
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index d988cb6..af2b897 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -209,7 +209,6 @@
"../../video:video_stream_decoder_impl",
"../task_queue",
"../video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -251,7 +250,6 @@
"../../video:video_stream_encoder_impl",
"../task_queue",
"../video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -273,7 +271,6 @@
"../../modules/video_coding:webrtc_vp9_helpers",
"../../rtc_base/system:fallthrough",
"../video_codecs:video_codecs_api",
- "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/api/video/builtin_video_bitrate_allocator_factory.cc b/api/video/builtin_video_bitrate_allocator_factory.cc
index 8991367..b2c15a1 100644
--- a/api/video/builtin_video_bitrate_allocator_factory.cc
+++ b/api/video/builtin_video_bitrate_allocator_factory.cc
@@ -10,7 +10,8 @@
#include "api/video/builtin_video_bitrate_allocator_factory.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "api/video/video_bitrate_allocator.h"
#include "api/video_codecs/video_codec.h"
#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
@@ -51,7 +52,7 @@
std::unique_ptr<VideoBitrateAllocatorFactory>
CreateBuiltinVideoBitrateAllocatorFactory() {
- return absl::make_unique<BuiltinVideoBitrateAllocatorFactory>();
+ return std::make_unique<BuiltinVideoBitrateAllocatorFactory>();
}
} // namespace webrtc
diff --git a/api/video/video_stream_decoder_create.cc b/api/video/video_stream_decoder_create.cc
index d17d739..8d70556 100644
--- a/api/video/video_stream_decoder_create.cc
+++ b/api/video/video_stream_decoder_create.cc
@@ -10,7 +10,8 @@
#include "api/video/video_stream_decoder_create.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "video/video_stream_decoder_impl.h"
namespace webrtc {
@@ -20,9 +21,9 @@
VideoDecoderFactory* decoder_factory,
TaskQueueFactory* task_queue_factory,
std::map<int, std::pair<SdpVideoFormat, int>> decoder_settings) {
- return absl::make_unique<VideoStreamDecoderImpl>(callbacks, decoder_factory,
- task_queue_factory,
- std::move(decoder_settings));
+ return std::make_unique<VideoStreamDecoderImpl>(callbacks, decoder_factory,
+ task_queue_factory,
+ std::move(decoder_settings));
}
} // namespace webrtc
diff --git a/api/video/video_stream_encoder_create.cc b/api/video/video_stream_encoder_create.cc
index c75f20d..ac2f6b9 100644
--- a/api/video/video_stream_encoder_create.cc
+++ b/api/video/video_stream_encoder_create.cc
@@ -10,7 +10,8 @@
#include "api/video/video_stream_encoder_create.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "video/overuse_frame_detector.h"
#include "video/video_stream_encoder.h"
@@ -22,9 +23,9 @@
uint32_t number_of_cores,
VideoStreamEncoderObserver* encoder_stats_observer,
const VideoStreamEncoderSettings& settings) {
- return absl::make_unique<VideoStreamEncoder>(
+ return std::make_unique<VideoStreamEncoder>(
clock, number_of_cores, encoder_stats_observer, settings,
- absl::make_unique<OveruseFrameDetector>(encoder_stats_observer),
+ std::make_unique<OveruseFrameDetector>(encoder_stats_observer),
task_queue_factory);
}
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 894d23f..795a5bb 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -82,7 +82,6 @@
"../../api:scoped_refptr",
"../../media:rtc_internal_video_codecs",
"../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -105,7 +104,6 @@
"../../media:rtc_media_base",
"../../rtc_base:checks",
"../../rtc_base/system:rtc_export",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
]
}
@@ -124,7 +122,6 @@
"../../modules/video_coding:video_coding_utility",
"../../modules/video_coding:webrtc_vp8_temporal_layers",
"../../rtc_base:checks",
- "//third_party/abseil-cpp/absl/memory",
]
}
@@ -153,7 +150,6 @@
"../video:video_bitrate_allocation",
"../video:video_frame",
"../video:video_rtp_headers",
- "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
}
diff --git a/api/video_codecs/builtin_video_decoder_factory.cc b/api/video_codecs/builtin_video_decoder_factory.cc
index e71e069..f831905 100644
--- a/api/video_codecs/builtin_video_decoder_factory.cc
+++ b/api/video_codecs/builtin_video_decoder_factory.cc
@@ -10,13 +10,14 @@
#include "api/video_codecs/builtin_video_decoder_factory.h"
-#include "absl/memory/memory.h"
+#include <memory>
+
#include "media/engine/internal_decoder_factory.h"
namespace webrtc {
std::unique_ptr<VideoDecoderFactory> CreateBuiltinVideoDecoderFactory() {
- return absl::make_unique<InternalDecoderFactory>();
+ return std::make_unique<InternalDecoderFactory>();
}
} // namespace webrtc
diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc
index 60c67fd..6888daa 100644
--- a/api/video_codecs/builtin_video_encoder_factory.cc
+++ b/api/video_codecs/builtin_video_encoder_factory.cc
@@ -10,9 +10,9 @@
#include "api/video_codecs/builtin_video_encoder_factory.h"
+#include <memory>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/strings/match.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
@@ -61,7 +61,7 @@
std::unique_ptr<VideoEncoder> internal_encoder;
if (IsFormatSupported(internal_encoder_factory_->GetSupportedFormats(),
format)) {
- internal_encoder = absl::make_unique<EncoderSimulcastProxy>(
+ internal_encoder = std::make_unique<EncoderSimulcastProxy>(
internal_encoder_factory_.get(), format);
}
@@ -79,7 +79,7 @@
} // namespace
std::unique_ptr<VideoEncoderFactory> CreateBuiltinVideoEncoderFactory() {
- return absl::make_unique<BuiltinVideoEncoderFactory>();
+ return std::make_unique<BuiltinVideoEncoderFactory>();
}
} // namespace webrtc
diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index 5e8a033..d57cbbb 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn
@@ -38,7 +38,6 @@
"../../video:video_frame_i420",
"../../video:video_rtp_headers",
"//testing/gtest",
- "//third_party/abseil-cpp/absl/memory",
]
}
}
diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 7b7d607..a26c0c3 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
@@ -17,7 +17,6 @@
#include <string>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/fec_controller_override.h"
#include "api/scoped_refptr.h"
@@ -193,11 +192,11 @@
std::vector<VideoFrameType> types(1, VideoFrameType::kVideoFrameKey);
frame_ =
- absl::make_unique<VideoFrame>(VideoFrame::Builder()
- .set_video_frame_buffer(buffer)
- .set_rotation(webrtc::kVideoRotation_0)
- .set_timestamp_us(0)
- .build());
+ std::make_unique<VideoFrame>(VideoFrame::Builder()
+ .set_video_frame_buffer(buffer)
+ .set_rotation(webrtc::kVideoRotation_0)
+ .set_timestamp_us(0)
+ .build());
EXPECT_EQ(expected_ret, fallback_wrapper_->Encode(*frame_, &types));
}
diff --git a/api/video_codecs/video_decoder_software_fallback_wrapper.cc b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
index 329fdfb..53b2413 100644
--- a/api/video_codecs/video_decoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
@@ -12,10 +12,10 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <utility>
-#include "absl/memory/memory.h"
#include "api/video/encoded_image.h"
#include "api/video_codecs/video_codec.h"
#include "modules/video_coding/include/video_error_codes.h"
@@ -225,7 +225,7 @@
std::unique_ptr<VideoDecoder> CreateVideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder) {
- return absl::make_unique<VideoDecoderSoftwareFallbackWrapper>(
+ return std::make_unique<VideoDecoderSoftwareFallbackWrapper>(
std::move(sw_fallback_decoder), std::move(hw_decoder));
}
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index 4d7e6f0..fe32741 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
@@ -13,11 +13,11 @@
#include <stdint.h>
#include <cstdio>
+#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/fec_controller_override.h"
#include "api/video/video_bitrate_allocation.h"
@@ -395,7 +395,7 @@
std::unique_ptr<VideoEncoder> CreateVideoEncoderSoftwareFallbackWrapper(
std::unique_ptr<VideoEncoder> sw_fallback_encoder,
std::unique_ptr<VideoEncoder> hw_encoder) {
- return absl::make_unique<VideoEncoderSoftwareFallbackWrapper>(
+ return std::make_unique<VideoEncoderSoftwareFallbackWrapper>(
std::move(sw_fallback_encoder), std::move(hw_encoder));
}
diff --git a/api/video_codecs/vp8_temporal_layers_factory.cc b/api/video_codecs/vp8_temporal_layers_factory.cc
index 0bd2c3d..1de925d 100644
--- a/api/video_codecs/vp8_temporal_layers_factory.cc
+++ b/api/video_codecs/vp8_temporal_layers_factory.cc
@@ -11,10 +11,10 @@
#include "api/video_codecs/vp8_temporal_layers_factory.h"
#include <algorithm>
+#include <memory>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
#include "api/fec_controller_override.h"
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
@@ -39,20 +39,20 @@
// Legacy screenshare layers supports max 2 layers.
num_temporal_layers = std::max(2, num_temporal_layers);
controllers.push_back(
- absl::make_unique<ScreenshareLayers>(num_temporal_layers));
+ std::make_unique<ScreenshareLayers>(num_temporal_layers));
} else {
controllers.push_back(
- absl::make_unique<DefaultTemporalLayers>(num_temporal_layers));
+ std::make_unique<DefaultTemporalLayers>(num_temporal_layers));
}
}
- return absl::make_unique<Vp8TemporalLayers>(std::move(controllers),
- fec_controller_override);
+ return std::make_unique<Vp8TemporalLayers>(std::move(controllers),
+ fec_controller_override);
}
std::unique_ptr<Vp8FrameBufferControllerFactory>
Vp8TemporalLayersFactory::Clone() const {
- return absl::make_unique<Vp8TemporalLayersFactory>();
+ return std::make_unique<Vp8TemporalLayersFactory>();
}
} // namespace webrtc