Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: webrtc/modules/utility/source/jvm_android.cc

Issue 1921233002: Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/utility/source/jvm_android.cc
diff --git a/webrtc/modules/utility/source/jvm_android.cc b/webrtc/modules/utility/source/jvm_android.cc
index eb37fda040596952261a7916938fed46ab2fcfed..d53d1b5eadf8620c760056a7aa078aabdb1c5e93 100644
--- a/webrtc/modules/utility/source/jvm_android.cc
+++ b/webrtc/modules/utility/source/jvm_android.cc
@@ -10,6 +10,8 @@
#include <android/log.h>
+#include <memory>
+
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/base/checks.h"
@@ -139,7 +141,7 @@ NativeRegistration::~NativeRegistration() {
CHECK_EXCEPTION(jni_) << "Error during UnregisterNatives";
}
-rtc::scoped_ptr<GlobalRef> NativeRegistration::NewObject(
+std::unique_ptr<GlobalRef> NativeRegistration::NewObject(
const char* name, const char* signature, ...) {
ALOGD("NativeRegistration::NewObject%s", GetThreadInfo().c_str());
va_list args;
@@ -149,7 +151,7 @@ rtc::scoped_ptr<GlobalRef> NativeRegistration::NewObject(
args);
CHECK_EXCEPTION(jni_) << "Error during NewObjectV";
va_end(args);
- return rtc::scoped_ptr<GlobalRef>(new GlobalRef(jni_, obj));
+ return std::unique_ptr<GlobalRef>(new GlobalRef(jni_, obj));
}
// JavaClass implementation.
@@ -181,14 +183,14 @@ JNIEnvironment::~JNIEnvironment() {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
}
-rtc::scoped_ptr<NativeRegistration> JNIEnvironment::RegisterNatives(
+std::unique_ptr<NativeRegistration> JNIEnvironment::RegisterNatives(
const char* name, const JNINativeMethod *methods, int num_methods) {
ALOGD("JNIEnvironment::RegisterNatives(%s)", name);
RTC_DCHECK(thread_checker_.CalledOnValidThread());
jclass clazz = LookUpClass(name);
jni_->RegisterNatives(clazz, methods, num_methods);
CHECK_EXCEPTION(jni_) << "Error during RegisterNatives";
- return rtc::scoped_ptr<NativeRegistration>(
+ return std::unique_ptr<NativeRegistration>(
new NativeRegistration(jni_, clazz));
}
@@ -240,7 +242,7 @@ JVM::~JVM() {
DeleteGlobalRef(jni(), context_);
}
-rtc::scoped_ptr<JNIEnvironment> JVM::environment() {
+std::unique_ptr<JNIEnvironment> JVM::environment() {
ALOGD("JVM::environment%s", GetThreadInfo().c_str());
// The JNIEnv is used for thread-local storage. For this reason, we cannot
// share a JNIEnv between threads. If a piece of code has no other way to get
@@ -250,9 +252,9 @@ rtc::scoped_ptr<JNIEnvironment> JVM::environment() {
JNIEnv* jni = GetEnv(jvm_);
if (!jni) {
ALOGE("AttachCurrentThread() has not been called on this thread.");
- return rtc::scoped_ptr<JNIEnvironment>();
+ return std::unique_ptr<JNIEnvironment>();
}
- return rtc::scoped_ptr<JNIEnvironment>(new JNIEnvironment(jni));
+ return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni));
}
JavaClass JVM::GetClass(const char* name) {
« no previous file with comments | « webrtc/modules/utility/include/process_thread.h ('k') | webrtc/modules/utility/source/process_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698