jni_generator: Wrap all native methods in stubs.

base/android/jni_generator/testSingleJNIAdditionalImport.golden

Index: base/android/jni_generator/testSingleJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testSingleJNIAdditionalImport.golden b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
index 1cf655420531d099c2e651909536eb10f2ecd650..353613946b0756cbcabc394edbb1d1cbcf9288e0 100644
--- a/base/android/jni_generator/testSingleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
@@ -25,10 +25,16 @@ jclass g_Foo_clazz = NULL;
 
 }  // namespace
 
+// Step 2: method stubs.
+
 static void DoSomething(JNIEnv* env, jclass jcaller,
     jobject callback);
 
-// Step 2: method stubs.
+static void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass
+    jcaller,
+    jobject callback) {
+  return DoSomething(env, jcaller, callback);
+}
 
 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
 static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
@@ -60,7 +66,7 @@ static const JNINativeMethod kMethodsFoo[] = {
 "("
 "Lorg/chromium/foo/Bar$Callback;"
 ")"
-"V", reinterpret_cast<void*>(DoSomething) },
+"V", reinterpret_cast<void*>(Java_org_chromium_foo_Foo_nativeDoSomething) },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {