Updating JNIAdditionalImport to allow more than one import.

base/android/jni_generator/testJNIAdditionalImport.golden

Index: base/android/jni_generator/testJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testJNIAdditionalImport.golden b/base/android/jni_generator/testJNIAdditionalImport.golden
index e395657cf79bfc5b48642d54426b2d83a72c33c3..07472d86ae89824e160422d0729d2cbb8059c8cb 100644
--- a/base/android/jni_generator/testJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testJNIAdditionalImport.golden
@@ -27,10 +27,14 @@ jclass g_Foo_clazz = NULL;
 static void DoSomething(JNIEnv* env, jclass jcaller,
     jobject callback);
 
+static void DoSomething(JNIEnv* env, jclass jcaller,
+    jobject callback1,
+    jobject callback2);
+
 // Step 2: method stubs.
 
-static base::subtle::AtomicWord g_Foo_calledByNative = 0;
-static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
+static base::subtle::AtomicWord g_Foo_calledByNativeV_OCFBC = 0;
+static void Java_Foo_calledByNativeV_OCFBC(JNIEnv* env, jobject callback) {
   /* Must call RegisterNativesImpl()  */
   CHECK_CLAZZ(env, g_Foo_clazz,
       g_Foo_clazz);
@@ -44,7 +48,7 @@ static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
 "Lorg/chromium/foo/Bar$Callback;"
 ")"
 "V",
-      &g_Foo_calledByNative);
+      &g_Foo_calledByNativeV_OCFBC);
 
      env->CallStaticVoidMethod(g_Foo_clazz,
           method_id, callback);
@@ -52,6 +56,31 @@ static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
 
 }
 
+static base::subtle::AtomicWord g_Foo_calledByNativeV_OCFBC_OCFBC = 0;
+static void Java_Foo_calledByNativeV_OCFBC_OCFBC(JNIEnv* env, jobject callback1,
+    jobject callback2) {
+  /* Must call RegisterNativesImpl()  */
+  CHECK_CLAZZ(env, g_Foo_clazz,
+      g_Foo_clazz);
+  jmethodID method_id =
+      base::android::MethodID::LazyGet<
+      base::android::MethodID::TYPE_STATIC>(
+      env, g_Foo_clazz,

[bulach, 2014/05/22 17:13:45]

as above, this g_Foo_clazz is wrong, but that's just an artifact of the test
data... if we split the test, the generated code will be correct. similarly for
the "V_OCFBC_OCFBC" mangled suffix..

[qsr, 2014/05/23 08:11:38]

Done.

+      "calledByNative",
+
+"("
+"Lorg/chromium/foo/Bar2$Callback;"
+"Lorg/chromium/foo/Bar3$Callback;"
+")"
+"V",
+      &g_Foo_calledByNativeV_OCFBC_OCFBC);
+
+     env->CallStaticVoidMethod(g_Foo_clazz,
+          method_id, callback1, callback2);
+  jni_generator::CheckException(env);
+
+}
+
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsFoo[] = {
@@ -60,6 +89,12 @@ static const JNINativeMethod kMethodsFoo[] = {
 "Lorg/chromium/foo/Bar$Callback;"
 ")"
 "V", reinterpret_cast<void*>(DoSomething) },
+    { "nativeDoSomething",
+"("
+"Lorg/chromium/foo/Bar2$Callback;"
+"Lorg/chromium/foo/Bar3$Callback;"
+")"
+"V", reinterpret_cast<void*>(DoSomething) },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {