Upstream Android JNI code, allowing us to use more ScopedJava references.

base/android/scoped_java_ref.h

 // Copyright (c) 2011 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.
 
 #ifndef BASE_ANDROID_SCOPED_JAVA_REF_H_
 #define BASE_ANDROID_SCOPED_JAVA_REF_H_
 
 #include <jni.h>
 #include <stddef.h>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 
 namespace base {
 namespace android {
 
 // Forward declare the generic java reference template class.
 template<typename T> class JavaRef;
 
 // Template specialization of JavaRef, which acts as the base class for all
 // other JavaRef<> template types. This allows you to e.g. pass
 // ScopedJavaLocalRef<jstring> into a function taking const JavaRef<jobject>&
 template<>
 class JavaRef<jobject> {
  public:
   JNIEnv* env() const { return env_; }
   jobject obj() const { return obj_; }
 
+  bool is_null() const { return obj_ == NULL; }
+
  protected:
   // Initializes a NULL reference.
   JavaRef();
 
   // Takes ownership of the |obj| reference passed; requires it to be a local
   // reference type.
   JavaRef(JNIEnv* env, jobject obj);
 
   ~JavaRef();
 
   // The following are implementation detail convenience methods, for
   // use by the sub-classes.
   void SetNewLocalRef(JNIEnv* env, jobject obj);
   void SetNewGlobalRef(JNIEnv* env, jobject obj);
+  void ResetLocalRef();
+  void ResetGlobalRef();
   jobject ReleaseInternal();
 
  private:
   JNIEnv* env_;
   jobject obj_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaRef);
 };
 
 // Generic base class for ScopedJavaLocalRef and ScopedJavaGlobalRef. Useful
@@ skipping 45 matching lines @@
     this->Reset();
   }
 
   // Overloaded assignment operator defined for consistency with the implicit
   // copy constructor.
   void operator=(const ScopedJavaLocalRef<T>& other) {
     this->Reset(other);
   }
 
   void Reset() {
-    this->SetNewLocalRef(NULL, NULL);
+    this->ResetLocalRef();
   }
 
   template<typename U>
   void Reset(const U& other) {
     this->Reset(other.env(), other.obj());
   }
 
   template<typename U>
   void Reset(JNIEnv* env, U obj) {
     implicit_cast<T>(obj);  // Ensure U is assignable to T
@@ skipping 23 matching lines @@
   template<typename U>
   explicit ScopedJavaGlobalRef(const U& other) {
     this->Reset(other);
   }
 
   ~ScopedJavaGlobalRef() {
     this->Reset();
   }
 
   void Reset() {
-    this->SetNewGlobalRef(NULL, NULL);
+    this->ResetGlobalRef();
   }
 
   template<typename U>
   void Reset(const U& other) {
     this->Reset(other.env(), other.obj());
   }
 
   template<typename U>
   void Reset(JNIEnv* env, U obj) {
     implicit_cast<T>(obj);  // Ensure U is assignable to T
     this->SetNewGlobalRef(env, obj);
   }
 
   // Releases the global reference to the caller. The caller *must* delete the
   // global reference when it is done with it.
   T Release() {
     return static_cast<T>(this->ReleaseInternal());
   }
 };
 
 }  // namespace android
 }  // namespace base
 
 #endif  // BASE_ANDROID_SCOPED_JAVA_REF_H_