Android: lazy initialization for method id.

base/android/jni_generator/golden_sample_for_tests_jni.h

Index: base/android/jni_generator/golden_sample_for_tests_jni.h
diff --git a/base/android/jni_generator/golden_sample_for_tests_jni.h b/base/android/jni_generator/golden_sample_for_tests_jni.h
index b80f8f4609c90056936859376b805e4cde6fa363..e5ff21625879c54691bbb6f45f3af43063a39918 100644
--- a/base/android/jni_generator/golden_sample_for_tests_jni.h
+++ b/base/android/jni_generator/golden_sample_for_tests_jni.h
@@ -66,7 +66,7 @@ static jdouble MethodOtherP0(JNIEnv* env, jobject obj,
     jint nativePtr) {
   DCHECK(nativePtr) << "MethodOtherP0";
   CPPClass::InnerClass* native =
-        reinterpret_cast<CPPClass::InnerClass*>(nativePtr);
+      reinterpret_cast<CPPClass::InnerClass*>(nativePtr);
   return native->MethodOtherP0(env, obj);
 }
 
@@ -82,7 +82,20 @@ static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj, jint foo,
     jint bar) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_SampleForTests_clazz);
-  DCHECK(g_SampleForTests_javaMethod);
+
+  base::android::LazyMethodID::Get<
+      base::android::LazyMethodID::METHODTYPE_NORMAL,
+      base::android::LazyMethodID::EXCEPTIONCHECK_YES>(
+      env, g_SampleForTests_clazz,
+      "javaMethod",
+
+"("
+"I"
+"I"
+")"
+"I",
+      &g_SampleForTests_javaMethod);
+
   jint ret =
     env->CallIntMethod(obj,
       g_SampleForTests_javaMethod, foo, bar);
@@ -94,7 +107,18 @@ static jmethodID g_SampleForTests_staticJavaMethod = 0;
 static jboolean Java_SampleForTests_staticJavaMethod(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_SampleForTests_clazz);
-  DCHECK(g_SampleForTests_staticJavaMethod);
+
+  base::android::LazyMethodID::Get<
+      base::android::LazyMethodID::METHODTYPE_STATIC,
+      base::android::LazyMethodID::EXCEPTIONCHECK_YES>(
+      env, g_SampleForTests_clazz,
+      "staticJavaMethod",
+
+"("
+")"
+"Z",
+      &g_SampleForTests_staticJavaMethod);
+
   jboolean ret =
     env->CallStaticBooleanMethod(g_SampleForTests_clazz,
       g_SampleForTests_staticJavaMethod);
@@ -107,7 +131,17 @@ static void Java_SampleForTests_packagePrivateJavaMethod(JNIEnv* env, jobject
     obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_SampleForTests_clazz);
-  DCHECK(g_SampleForTests_packagePrivateJavaMethod);
+
+  base::android::LazyMethodID::Get<
+      base::android::LazyMethodID::METHODTYPE_NORMAL,
+      base::android::LazyMethodID::EXCEPTIONCHECK_YES>(
+      env, g_SampleForTests_clazz,
+      "packagePrivateJavaMethod",
+
+"("
+")"
+"V",
+      &g_SampleForTests_packagePrivateJavaMethod);
 
   env->CallVoidMethod(obj,
       g_SampleForTests_packagePrivateJavaMethod);
@@ -120,7 +154,17 @@ static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, jobject
     obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_SampleForTests_clazz);
-  DCHECK(g_SampleForTests_methodThatThrowsException);
+
+  base::android::LazyMethodID::Get<
+      base::android::LazyMethodID::METHODTYPE_NORMAL,
+      base::android::LazyMethodID::EXCEPTIONCHECK_YES>(
+      env, g_SampleForTests_clazz,
+      "methodThatThrowsException",
+
+"("
+")"
+"V",
+      &g_SampleForTests_methodThatThrowsException);
 
   env->CallVoidMethod(obj,
       g_SampleForTests_methodThatThrowsException);
@@ -131,7 +175,18 @@ static jmethodID g_InnerClass_JavaInnerMethod = 0;
 static jfloat Java_InnerClass_JavaInnerMethod(JNIEnv* env, jobject obj) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InnerClass_clazz);
-  DCHECK(g_InnerClass_JavaInnerMethod);
+
+  base::android::LazyMethodID::Get<
+      base::android::LazyMethodID::METHODTYPE_NORMAL,
+      base::android::LazyMethodID::EXCEPTIONCHECK_YES>(
+      env, g_InnerClass_clazz,
+      "JavaInnerMethod",
+
+"("
+")"
+"F",
+      &g_InnerClass_JavaInnerMethod);
+
   jfloat ret =
     env->CallFloatMethod(obj,
       g_InnerClass_JavaInnerMethod);
@@ -143,7 +198,17 @@ static jmethodID g_InnerClass_javaInnerFunction = 0;
 static void Java_InnerClass_javaInnerFunction(JNIEnv* env) {
   /* Must call RegisterNativesImpl()  */
   DCHECK(g_InnerClass_clazz);
-  DCHECK(g_InnerClass_javaInnerFunction);
+
+  base::android::LazyMethodID::Get<
+      base::android::LazyMethodID::METHODTYPE_STATIC,
+      base::android::LazyMethodID::EXCEPTIONCHECK_YES>(
+      env, g_InnerClass_clazz,
+      "javaInnerFunction",
+
+"("
+")"
+"V",
+      &g_InnerClass_javaInnerFunction);
 
   env->CallStaticVoidMethod(g_InnerClass_clazz,
       g_InnerClass_javaInnerFunction);
@@ -151,73 +216,14 @@ static void Java_InnerClass_javaInnerFunction(JNIEnv* env) {
 
 }
 
-// Step 3: GetMethodIDs and RegisterNatives.
-static void GetMethodIDsImpl(JNIEnv* env) {
+// Step 3: RegisterNatives.
+
+static bool RegisterNativesImpl(JNIEnv* env) {
+
   g_InnerClass_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetUnscopedClass(env, kInnerClassClassPath)));
   g_SampleForTests_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
       base::android::GetUnscopedClass(env, kSampleForTestsClassPath)));
-  g_SampleForTests_javaMethod =
-      base::android::GetMethodID(
-          env, g_SampleForTests_clazz,
-          "javaMethod",
-
-"("
-"I"
-"I"
-")"
-"I");
-
-  g_SampleForTests_staticJavaMethod =
-      base::android::GetStaticMethodID(
-          env, g_SampleForTests_clazz,
-          "staticJavaMethod",
-
-"("
-")"
-"Z");
-
-  g_SampleForTests_packagePrivateJavaMethod =
-      base::android::GetMethodID(
-          env, g_SampleForTests_clazz,
-          "packagePrivateJavaMethod",
-
-"("
-")"
-"V");
-
-  g_SampleForTests_methodThatThrowsException =
-      base::android::GetMethodID(
-          env, g_SampleForTests_clazz,
-          "methodThatThrowsException",
-
-"("
-")"
-"V");
-
-  g_InnerClass_JavaInnerMethod =
-      base::android::GetMethodID(
-          env, g_InnerClass_clazz,
-          "JavaInnerMethod",
-
-"("
-")"
-"F");
-
-  g_InnerClass_javaInnerFunction =
-      base::android::GetStaticMethodID(
-          env, g_InnerClass_clazz,
-          "javaInnerFunction",
-
-"("
-")"
-"V");
-
-}
-
-static bool RegisterNativesImpl(JNIEnv* env) {
-  GetMethodIDsImpl(env);
-
   static const JNINativeMethod kMethodsInnerClass[] = {
     { "nativeInnerFunction",
 "("