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

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

Issue 1924443002: Revert of 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 d53d1b5eadf8620c760056a7aa078aabdb1c5e93..eb37fda040596952261a7916938fed46ab2fcfed 100644
--- a/webrtc/modules/utility/source/jvm_android.cc
+++ b/webrtc/modules/utility/source/jvm_android.cc
@@ -9,8 +9,6 @@
*/
#include <android/log.h>
-
-#include <memory>
#include "webrtc/modules/utility/include/jvm_android.h"
@@ -141,7 +139,7 @@
CHECK_EXCEPTION(jni_) << "Error during UnregisterNatives";
}
-std::unique_ptr<GlobalRef> NativeRegistration::NewObject(
+rtc::scoped_ptr<GlobalRef> NativeRegistration::NewObject(
const char* name, const char* signature, ...) {
ALOGD("NativeRegistration::NewObject%s", GetThreadInfo().c_str());
va_list args;
@@ -151,7 +149,7 @@
args);
CHECK_EXCEPTION(jni_) << "Error during NewObjectV";
va_end(args);
- return std::unique_ptr<GlobalRef>(new GlobalRef(jni_, obj));
+ return rtc::scoped_ptr<GlobalRef>(new GlobalRef(jni_, obj));
}
// JavaClass implementation.
@@ -183,14 +181,14 @@
RTC_DCHECK(thread_checker_.CalledOnValidThread());
}
-std::unique_ptr<NativeRegistration> JNIEnvironment::RegisterNatives(
+rtc::scoped_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 std::unique_ptr<NativeRegistration>(
+ return rtc::scoped_ptr<NativeRegistration>(
new NativeRegistration(jni_, clazz));
}
@@ -242,7 +240,7 @@
DeleteGlobalRef(jni(), context_);
}
-std::unique_ptr<JNIEnvironment> JVM::environment() {
+rtc::scoped_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
@@ -252,9 +250,9 @@
JNIEnv* jni = GetEnv(jvm_);
if (!jni) {
ALOGE("AttachCurrentThread() has not been called on this thread.");
- return std::unique_ptr<JNIEnvironment>();
- }
- return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni));
+ return rtc::scoped_ptr<JNIEnvironment>();
+ }
+ return rtc::scoped_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