Revert 290810 "Make class lookup lazy in jni_generator when usin..."

trunk/src/base/android/jni_generator/testNativeExportsOption.golden

 // Copyright 2014 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.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/example/jni_generator/SampleForTests
 
 #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
 #define org_chromium_example_jni_generator_SampleForTests_JNI
 
 #include <jni.h>
 
 #include "base/android/jni_generator/jni_generator_helper.h"
 
 #include "base/android/jni_int_wrapper.h"
 
 // Step 1: forward declarations.
 namespace {
 const char kSampleForTestsClassPath[] =
     "org/chromium/example/jni_generator/SampleForTests";
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-base::subtle::AtomicWord g_SampleForTests_clazz = 0;
-jclass SampleForTests_clazz(JNIEnv* env) {
-  return base::android::LazyGetClass(env, kSampleForTestsClassPath,
-      &g_SampleForTests_clazz);
-}
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+jclass g_SampleForTests_clazz = NULL;
 
 }  // namespace
 
 extern "C" {
 
 static jint Init(JNIEnv* env, jobject jcaller);
 
 __attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyInnerClass_nativeInit(JNIEnv*
@@ skipping 37 matching lines @@
   Test* native = reinterpret_cast<Test*>(nativeTest);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
   return native->Method(env, jcaller, arg1);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithParam = 0;
 static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      SampleForTests_clazz(env));
+      g_SampleForTests_clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, SampleForTests_clazz(env),
+      env, g_SampleForTests_clazz,
       "testMethodWithParam",
 
 "("
 "I"
 ")"
 "V",
       &g_SampleForTests_testMethodWithParam);
 
      env->CallVoidMethod(obj,
           method_id, as_jint(iParam));
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithParamAndReturn =
     0;
 static base::android::ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, jobject obj,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, obj,
-      SampleForTests_clazz(env), NULL);
+      g_SampleForTests_clazz, NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, SampleForTests_clazz(env),
+      env, g_SampleForTests_clazz,
       "testMethodWithParamAndReturn",
 
 "("
 "I"
 ")"
 "Ljava/lang/String;",
       &g_SampleForTests_testMethodWithParamAndReturn);
 
   jstring ret =
       static_cast<jstring>(env->CallObjectMethod(obj,
           method_id, as_jint(iParam)));
   jni_generator::CheckException(env);
   return base::android::ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithParam = 0;
 static jint Java_SampleForTests_testStaticMethodWithParam(JNIEnv* env,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
-  CHECK_CLAZZ(env, SampleForTests_clazz(env),
-      SampleForTests_clazz(env), 0);
+  CHECK_CLAZZ(env, g_SampleForTests_clazz,
+      g_SampleForTests_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, SampleForTests_clazz(env),
+      env, g_SampleForTests_clazz,
       "testStaticMethodWithParam",
 
 "("
 "I"
 ")"
 "I",
       &g_SampleForTests_testStaticMethodWithParam);
 
   jint ret =
-      env->CallStaticIntMethod(SampleForTests_clazz(env),
+      env->CallStaticIntMethod(g_SampleForTests_clazz,
           method_id, as_jint(iParam));
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithNoParam = 0;
 static jdouble Java_SampleForTests_testMethodWithNoParam(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
-  CHECK_CLAZZ(env, SampleForTests_clazz(env),
-      SampleForTests_clazz(env), 0);
+  CHECK_CLAZZ(env, g_SampleForTests_clazz,
+      g_SampleForTests_clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, SampleForTests_clazz(env),
+      env, g_SampleForTests_clazz,
       "testMethodWithNoParam",
 
 "("
 ")"
 "D",
       &g_SampleForTests_testMethodWithNoParam);
 
   jdouble ret =
-      env->CallStaticDoubleMethod(SampleForTests_clazz(env),
+      env->CallStaticDoubleMethod(g_SampleForTests_clazz,
           method_id);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithNoParam =
     0;
 static base::android::ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testStaticMethodWithNoParam(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
-  CHECK_CLAZZ(env, SampleForTests_clazz(env),
-      SampleForTests_clazz(env), NULL);
+  CHECK_CLAZZ(env, g_SampleForTests_clazz,
+      g_SampleForTests_clazz, NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, SampleForTests_clazz(env),
+      env, g_SampleForTests_clazz,
       "testStaticMethodWithNoParam",
 
 "("
 ")"
 "Ljava/lang/String;",
       &g_SampleForTests_testStaticMethodWithNoParam);
 
   jstring ret =
-static_cast<jstring>(env->CallStaticObjectMethod(SampleForTests_clazz(env),
+      static_cast<jstring>(env->CallStaticObjectMethod(g_SampleForTests_clazz,
           method_id));
   jni_generator::CheckException(env);
   return base::android::ScopedJavaLocalRef<jstring>(env, ret);
 }
 };  // extern "C"
 
 // Step 3: RegisterNatives.
 
 static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
-    base::subtle::Release_Store(&g_SampleForTests_clazz,
-      static_cast<base::subtle::AtomicWord>(env->NewWeakGlobalRef(clazz));
+  g_SampleForTests_clazz = static_cast<jclass>(env->NewWeakGlobalRef(clazz));
 
   return true;
 }
 
 extern "C" JNIEXPORT bool JNICALL
 Java_org_chromium_example_jni_1generator_SampleForTests_nativeInitNativeClass(JNIEnv*
     env, jclass clazz) {
   return RegisterNativesImpl(env, clazz);
 }
 
 #endif  // org_chromium_example_jni_generator_SampleForTests_JNI