JNI: allow either JavaRef or bare objects in Java calls.

base/android/scoped_java_ref.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/scoped_java_ref.h"
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 
 namespace base {
 namespace android {
 namespace {
 
 const int kDefaultLocalFrameCapacity = 16;
 
 }  // namespace
 
 ScopedJavaLocalFrame::ScopedJavaLocalFrame(JNIEnv* env) : env_(env) {
   int failed = env_->PushLocalFrame(kDefaultLocalFrameCapacity);
   DCHECK(!failed);
 }
 
 ScopedJavaLocalFrame::ScopedJavaLocalFrame(JNIEnv* env, int capacity)
     : env_(env) {
   int failed = env_->PushLocalFrame(capacity);
   DCHECK(!failed);
 }
 
-ScopedJavaLocalFrame::~ScopedJavaLocalFrame() { env_->PopLocalFrame(NULL); }
+ScopedJavaLocalFrame::~ScopedJavaLocalFrame() {
+  env_->PopLocalFrame(nullptr);
+}
 
 #if DCHECK_IS_ON()
 // This constructor is inlined when DCHECKs are disabled; don't add anything
 // else here.
 JavaRef<jobject>::JavaRef(JNIEnv* env, jobject obj) : obj_(obj) {
   if (obj) {
     DCHECK(env && env->GetObjectRefType(obj) == JNILocalRefType);
   }
 }
 #endif
@@ skipping 22 matching lines @@
     obj = env->NewGlobalRef(obj);
   if (obj_)
     env->DeleteGlobalRef(obj_);
   obj_ = obj;
 }
 
 void JavaRef<jobject>::ResetLocalRef(JNIEnv* env) {
   if (obj_) {
     DCHECK_EQ(env, AttachCurrentThread());  // Is |env| on correct thread.
     env->DeleteLocalRef(obj_);
-    obj_ = NULL;
+    obj_ = nullptr;
   }
 }
 
 void JavaRef<jobject>::ResetGlobalRef() {
   if (obj_) {
     AttachCurrentThread()->DeleteGlobalRef(obj_);
-    obj_ = NULL;
+    obj_ = nullptr;
   }
 }
 
 jobject JavaRef<jobject>::ReleaseInternal() {
   jobject obj = obj_;
-  obj_ = NULL;
+  obj_ = nullptr;
   return obj;
 }
 
 }  // namespace android
 }  // namespace base