Index: webrtc/modules/audio_device/android/audio_record_jni.cc |
diff --git a/webrtc/modules/audio_device/android/audio_record_jni.cc b/webrtc/modules/audio_device/android/audio_record_jni.cc |
index 5dda7249ac641f1ca9c2e10f46cea48382147aaa..5ff59971cf88ad060b3985f3d696ef8559f0831c 100644 |
--- a/webrtc/modules/audio_device/android/audio_record_jni.cc |
+++ b/webrtc/modules/audio_device/android/audio_record_jni.cc |
@@ -31,7 +31,7 @@ namespace webrtc { |
// AudioRecordJni::JavaAudioRecord implementation. |
AudioRecordJni::JavaAudioRecord::JavaAudioRecord( |
NativeRegistration* native_reg, |
- rtc::scoped_ptr<GlobalRef> audio_record) |
+ std::unique_ptr<GlobalRef> audio_record) |
: audio_record_(std::move(audio_record)), |
init_recording_(native_reg->GetMethodId("initRecording", "(II)I")), |
start_recording_(native_reg->GetMethodId("startRecording", "()Z")), |
@@ -74,7 +74,7 @@ bool AudioRecordJni::JavaAudioRecord::EnableBuiltInNS(bool enable) { |
// AudioRecordJni implementation. |
AudioRecordJni::AudioRecordJni(AudioManager* audio_manager) |
- : j_environment_(JVM::GetInstance()->environment()), |
+ : j_environment_(rtc::ScopedToUnique(JVM::GetInstance()->environment())), |
audio_manager_(audio_manager), |
audio_parameters_(audio_manager->GetRecordAudioParameters()), |
total_delay_in_milliseconds_(0), |
@@ -93,14 +93,14 @@ AudioRecordJni::AudioRecordJni(AudioManager* audio_manager) |
&webrtc::AudioRecordJni::CacheDirectBufferAddress)}, |
{"nativeDataIsRecorded", "(IJ)V", |
reinterpret_cast<void*>(&webrtc::AudioRecordJni::DataIsRecorded)}}; |
- j_native_registration_ = j_environment_->RegisterNatives( |
+ j_native_registration_ = rtc::ScopedToUnique(j_environment_->RegisterNatives( |
"org/webrtc/voiceengine/WebRtcAudioRecord", |
- native_methods, arraysize(native_methods)); |
+ native_methods, arraysize(native_methods))); |
j_audio_record_.reset(new JavaAudioRecord( |
j_native_registration_.get(), |
- j_native_registration_->NewObject( |
+ rtc::ScopedToUnique(j_native_registration_->NewObject( |
"<init>", "(Landroid/content/Context;J)V", |
- JVM::GetInstance()->context(), PointerTojlong(this)))); |
+ JVM::GetInstance()->context(), PointerTojlong(this))))); |
// Detach from this thread since we want to use the checker to verify calls |
// from the Java based audio thread. |
thread_checker_java_.DetachFromThread(); |