Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/

webrtc/modules/utility/source/jvm_android.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <android/log.h>
 
-#include <memory>
-
 #include "webrtc/modules/utility/include/jvm_android.h"
 
 #include "webrtc/base/checks.h"
 
 #define TAG "JVM"
 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
 
 namespace webrtc {
 
@@ skipping 109 matching lines @@
     : JavaClass(jni, clazz), jni_(jni) {
   ALOGD("NativeRegistration::ctor%s", GetThreadInfo().c_str());
 }
 
 NativeRegistration::~NativeRegistration() {
   ALOGD("NativeRegistration::dtor%s", GetThreadInfo().c_str());
   jni_->UnregisterNatives(j_class_);
   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;
   va_start(args, signature);
   jobject obj = jni_->NewObjectV(j_class_,
                                  GetMethodID(jni_, j_class_, name, signature),
                                  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.
 jmethodID JavaClass::GetMethodId(
     const char* name, const char* signature) {
   return GetMethodID(jni_, j_class_, name, signature);
 }
 
 jmethodID JavaClass::GetStaticMethodId(
     const char* name, const char* signature) {
@@ skipping 11 matching lines @@
 // JNIEnvironment implementation.
 JNIEnvironment::JNIEnvironment(JNIEnv* jni) : jni_(jni) {
   ALOGD("JNIEnvironment::ctor%s", GetThreadInfo().c_str());
 }
 
 JNIEnvironment::~JNIEnvironment() {
   ALOGD("JNIEnvironment::dtor%s", GetThreadInfo().c_str());
   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));
 }
 
 std::string JNIEnvironment::JavaToStdString(const jstring& j_string) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   const char* jchars = jni_->GetStringUTFChars(j_string, nullptr);
   CHECK_EXCEPTION(jni_);
   const int size = jni_->GetStringUTFLength(j_string);
   CHECK_EXCEPTION(jni_);
   std::string ret(jchars, size);
@@ skipping 31 matching lines @@
   LoadClasses(jni());
 }
 
 JVM::~JVM() {
   ALOGD("JVM::~JVM%s", GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   FreeClassReferences(jni());
   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
   // its JNIEnv, we should share the JavaVM, and use GetEnv to discover the
   // thread's JNIEnv. (Assuming it has one, if not, use AttachCurrentThread).
   // See // http://developer.android.com/training/articles/perf-jni.html.
   JNIEnv* jni = GetEnv(jvm_);
   if (!jni) {
     ALOGE("AttachCurrentThread() has not been called on this thread.");
-    return std::unique_ptr<JNIEnvironment>();
+    return rtc::scoped_ptr<JNIEnvironment>();
   }
-  return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni));
+  return rtc::scoped_ptr<JNIEnvironment>(new JNIEnvironment(jni));
 }
 
 JavaClass JVM::GetClass(const char* name) {
   ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return JavaClass(jni(), LookUpClass(name));
 }
 
 }  // namespace webrtc