jni_generator: Wrap all native methods in stubs.

base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden

Index: base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
diff --git a/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
index c8d4b3cdd4cc5b55434c849e91581de867ee37d8..a9e645cc41b8c861b227415a67c54c12c546f3e6 100644
--- a/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
+++ b/base/android/jni_generator/testInnerClassNativesBothInnerAndOuter.golden
@@ -27,11 +27,20 @@ jclass g_TestJni_clazz = NULL;
 
 }  // namespace
 
+// Step 2: method stubs.
+
 static jint Init(JNIEnv* env, jobject jcaller);
 
+static jint Java_org_chromium_TestJni_nativeInit(JNIEnv* env, jobject jcaller) {
+  return Init(env, jcaller);
+}
+
 static jint Init(JNIEnv* env, jobject jcaller);
 
-// Step 2: method stubs.
+static jint Java_org_chromium_TestJni_00024MyOtherInnerClass_nativeInit(JNIEnv*
+    env, jobject jcaller) {
+  return Init(env, jcaller);
+}
 
 // Step 3: RegisterNatives.
 
@@ -39,14 +48,16 @@ static const JNINativeMethod kMethodsMyOtherInnerClass[] = {
     { "nativeInit",
 "("
 ")"
-"I", reinterpret_cast<void*>(Init) },
+"I",
+    reinterpret_cast<void*>(Java_org_chromium_TestJni_00024MyOtherInnerClass_nativeInit)
+    },
 };
 
 static const JNINativeMethod kMethodsTestJni[] = {
     { "nativeInit",
 "("
 ")"
-"I", reinterpret_cast<void*>(Init) },
+"I", reinterpret_cast<void*>(Java_org_chromium_TestJni_nativeInit) },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {