Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
This commit is contained in:
@ -10,7 +10,7 @@
|
||||
|
||||
#include "sdk/android/native_api/codecs/wrapper.h"
|
||||
|
||||
#include "rtc_base/ptr_util.h"
|
||||
#include "absl/memory/memory.h"
|
||||
#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
|
||||
#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
|
||||
|
||||
@ -19,14 +19,14 @@ namespace webrtc {
|
||||
std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
|
||||
JNIEnv* jni,
|
||||
jobject decoder_factory) {
|
||||
return rtc::MakeUnique<jni::VideoDecoderFactoryWrapper>(
|
||||
return absl::make_unique<jni::VideoDecoderFactoryWrapper>(
|
||||
jni, JavaParamRef<jobject>(decoder_factory));
|
||||
}
|
||||
|
||||
std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory(
|
||||
JNIEnv* jni,
|
||||
jobject en) {
|
||||
return rtc::MakeUnique<jni::VideoEncoderFactoryWrapper>(
|
||||
return absl::make_unique<jni::VideoEncoderFactoryWrapper>(
|
||||
jni, JavaParamRef<jobject>(en));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user