Make class lookup lazy in jni_generator when using lazy method lookup.

base/android/jni_generator/testNativeExportsOption.golden

Index: base/android/jni_generator/testNativeExportsOption.golden
diff --git a/base/android/jni_generator/testNativeExportsOption.golden b/base/android/jni_generator/testNativeExportsOption.golden
index 231be7ce6e62725d237a225bdac9972bc253f0b6..bae5b9dc9a50a9d6fccef76b748706806df608cf 100644
--- a/base/android/jni_generator/testNativeExportsOption.golden
+++ b/base/android/jni_generator/testNativeExportsOption.golden
@@ -21,7 +21,7 @@ namespace {
 const char kSampleForTestsClassPath[] =
     "org/chromium/example/jni_generator/SampleForTests";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-jclass g_SampleForTests_clazz = NULL;
+base::subtle::AtomicWord g_SampleForTests_clazz = 0;
 
 }  // namespace
 
@@ -78,12 +78,15 @@ static base::subtle::AtomicWord g_SampleForTests_testMethodWithParam = 0;
 static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
+  jclass clazz =
+    base::android::LazyGetClass(env, kSampleForTestsClassPath,
+        g_SampleForTests_clazz)
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz);
+      clazz);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, clazz,
       "testMethodWithParam",
 
 "("
@@ -104,12 +107,15 @@ static base::android::ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, jobject obj,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
+  jclass clazz =
+    base::android::LazyGetClass(env, kSampleForTestsClassPath,
+        g_SampleForTests_clazz)
   CHECK_CLAZZ(env, obj,
-      g_SampleForTests_clazz, NULL);
+      clazz, NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
-      env, g_SampleForTests_clazz,
+      env, clazz,
       "testMethodWithParamAndReturn",
 
 "("
@@ -129,12 +135,15 @@ static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithParam = 0;
 static jint Java_SampleForTests_testStaticMethodWithParam(JNIEnv* env,
     JniIntWrapper iParam) {
   /* Must call RegisterNativesImpl()  */
+  jclass clazz =
+    base::android::LazyGetClass(env, kSampleForTestsClassPath,
+        g_SampleForTests_clazz)
   CHECK_CLAZZ(env, g_SampleForTests_clazz,
-      g_SampleForTests_clazz, 0);
+      clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, g_SampleForTests_clazz,
+      env, clazz,
       "testStaticMethodWithParam",
 
 "("
@@ -153,12 +162,15 @@ static jint Java_SampleForTests_testStaticMethodWithParam(JNIEnv* env,
 static base::subtle::AtomicWord g_SampleForTests_testMethodWithNoParam = 0;
 static jdouble Java_SampleForTests_testMethodWithNoParam(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
+  jclass clazz =
+    base::android::LazyGetClass(env, kSampleForTestsClassPath,
+        g_SampleForTests_clazz)
   CHECK_CLAZZ(env, g_SampleForTests_clazz,
-      g_SampleForTests_clazz, 0);
+      clazz, 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, g_SampleForTests_clazz,
+      env, clazz,
       "testMethodWithNoParam",
 
 "("
@@ -178,12 +190,15 @@ static base::subtle::AtomicWord g_SampleForTests_testStaticMethodWithNoParam =
 static base::android::ScopedJavaLocalRef<jstring>
     Java_SampleForTests_testStaticMethodWithNoParam(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
+  jclass clazz =
+    base::android::LazyGetClass(env, kSampleForTestsClassPath,
+        g_SampleForTests_clazz)
   CHECK_CLAZZ(env, g_SampleForTests_clazz,
-      g_SampleForTests_clazz, NULL);
+      clazz, NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
-      env, g_SampleForTests_clazz,
+      env, clazz,
       "testStaticMethodWithNoParam",
 
 "("
@@ -202,7 +217,6 @@ static base::android::ScopedJavaLocalRef<jstring>
 // Step 3: RegisterNatives.
 
 static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
-  g_SampleForTests_clazz = static_cast<jclass>(env->NewWeakGlobalRef(clazz));
 
   return true;
 }