JNI Bindings on Chrome for Android: unfork.

base/android/jni_android.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/jni_android.h"
 
 #include <map>
 
 #include "base/atomicops.h"
 #include "base/lazy_instance.h"
@@ skipping 68 matching lines @@
   DCHECK(g_application_context.Get().is_null());
   g_application_context.Get().Reset(context);
 }
 
 const jobject GetApplicationContext() {
   DCHECK(!g_application_context.Get().is_null());
   return g_application_context.Get().obj();
 }
 
 ScopedJavaLocalRef<jclass> GetClass(JNIEnv* env, const char* class_name) {
+  return ScopedJavaLocalRef<jclass>(env, GetUnscopedClass(env, class_name));
+}
+
+jclass GetUnscopedClass(JNIEnv* env, const char* class_name) {
   jclass clazz = env->FindClass(class_name);
   CHECK(clazz && !ClearException(env)) << "Failed to find class " << class_name;
-  return ScopedJavaLocalRef<jclass>(env, clazz);
+  return clazz;
 }
 
 bool HasClass(JNIEnv* env, const char* class_name) {
   ScopedJavaLocalRef<jclass> clazz(env, env->FindClass(class_name));
   if (!clazz.obj()) {
     ClearException(env);
     return false;
   }
   bool error = ClearException(env);
   DCHECK(!error);
   return true;
 }
 
 jmethodID GetMethodID(JNIEnv* env,
                       const JavaRef<jclass>& clazz,
                       const char* method_name,
                       const char* jni_signature) {
+  // We can't use clazz.env() as that may be from a different thread.
+  return GetMethodID(env, clazz.obj(), method_name, jni_signature);
+}
+
+jmethodID GetMethodID(JNIEnv* env,
+                      jclass clazz,
+                      const char* method_name,
+                      const char* jni_signature) {
   jmethodID method_id =
-      env->GetMethodID(clazz.obj(), method_name, jni_signature);
+      env->GetMethodID(clazz, method_name, jni_signature);
   CHECK(method_id && !ClearException(env)) << "Failed to find method " <<
       method_name << " " << jni_signature;
   return method_id;
 }
 
 jmethodID GetStaticMethodID(JNIEnv* env,
                             const JavaRef<jclass>& clazz,
                             const char* method_name,
                             const char* jni_signature) {
+  return GetStaticMethodID(env, clazz.obj(), method_name,
+      jni_signature);
+}
+
+jmethodID GetStaticMethodID(JNIEnv* env,
+                            jclass clazz,
+                            const char* method_name,
+                            const char* jni_signature) {
   jmethodID method_id =
-      env->GetStaticMethodID(clazz.obj(), method_name, jni_signature);
+      env->GetStaticMethodID(clazz, method_name, jni_signature);
   CHECK(method_id && !ClearException(env)) << "Failed to find static method " <<
       method_name << " " << jni_signature;
   return method_id;
 }
 
 bool HasMethod(JNIEnv* env,
                const JavaRef<jclass>& clazz,
                const char* method_name,
                const char* jni_signature) {
   jmethodID method_id =
@@ skipping 104 matching lines @@
 
 void CheckException(JNIEnv* env) {
   if (HasException(env)) {
     env->ExceptionDescribe();
     CHECK(false);
   }
 }
 
 }  // namespace android
 }  // namespace base