Make content JNI API accept a list of callbacks

It turned out we still need a list of callbacks to be passed into content,
downstream Android has its own JNI registration and initialization,
chrome_sync_shell does too, they both need to be passed into content along
with chrome's

BUG=447393

Review URL: https://codereview.chromium.org/956073002

Cr-Commit-Position: refs/heads/master@{#318302}

android_webview/lib/main/webview_entry_point.cc

@@ -14,9 +14,12 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   // improve startup peformance.
   base::android::DisableManualJniRegistration();
 
-  if (!content::android::OnJNIOnLoadRegisterJNI(
-          vm, base::Bind(&android_webview::RegisterJNI)) ||
-      !content::android::OnJNIOnLoadInit(base::Bind(&android_webview::Init))) {
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&android_webview::RegisterJNI));
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&android_webview::Init));
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !content::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
   }
   return JNI_VERSION_1_4;

chrome/app/android/chrome_jni_onload.cc

@@ -24,10 +24,13 @@ bool Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  if (!content::android::OnJNIOnLoadRegisterJNI(
-          vm, base::Bind(&RegisterJNI)) ||
-      !content::android::OnJNIOnLoadInit(base::Bind(&Init)))
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !content::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
-
+  }
   return JNI_VERSION_1_4;
 }

chromecast/app/android/cast_jni_loader.cc

@@ -34,10 +34,13 @@ bool Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  if (!content::android::OnJNIOnLoadRegisterJNI(
-          vm, base::Bind(&RegisterJNI)) ||
-      !content::android::OnJNIOnLoadInit(base::Bind(&Init)))
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !content::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
-
+  }
   return JNI_VERSION_1_4;
 }

content/app/android/content_jni_onload.cc

@@ -31,16 +31,13 @@ bool Init() {
 
 bool OnJNIOnLoadRegisterJNI(
     JavaVM* vm,
-    base::android::RegisterCallback callback) {
-  std::vector<base::android::RegisterCallback> callbacks;
-  callbacks.push_back(callback);
+    std::vector<base::android::RegisterCallback> callbacks) {
   callbacks.push_back(base::Bind(&RegisterJNI));
   return base::android::OnJNIOnLoadRegisterJNI(vm, callbacks);
 }
 
-bool OnJNIOnLoadInit(base::android::InitCallback callback) {
-  std::vector<base::android::InitCallback> callbacks;
-  callbacks.push_back(callback);
+bool OnJNIOnLoadInit(
+    std::vector<base::android::InitCallback> callbacks) {
   callbacks.push_back(base::Bind(&Init));
   return base::android::OnJNIOnLoadInit(callbacks);
 }

content/public/app/content_jni_onload.h

@@ -16,10 +16,11 @@ namespace android {
 // Returns true if JNI registration succeeded.
 CONTENT_EXPORT bool OnJNIOnLoadRegisterJNI(
     JavaVM* vm,
-    base::android::RegisterCallback callback);
+    std::vector<base::android::RegisterCallback> callbacks);
 
 // Returns true if initialization succeeded.
-CONTENT_EXPORT bool OnJNIOnLoadInit(base::android::InitCallback callback);
+CONTENT_EXPORT bool OnJNIOnLoadInit(
+    std::vector<base::android::InitCallback> callbacks);
 
 }  // namespace android
 }  // namespace content

content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc

@@ -29,10 +29,13 @@ bool Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  if (!content::android::OnJNIOnLoadRegisterJNI(
-          vm, base::Bind(&RegisterJNI)) ||
-      !content::android::OnJNIOnLoadInit(base::Bind(&Init)))
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !content::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
-
+  }
   return JNI_VERSION_1_4;
 }

content/shell/android/linker_test_apk/chromium_linker_test_android.cc

@@ -35,10 +35,13 @@ bool Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  if (!content::android::OnJNIOnLoadRegisterJNI(
-          vm, base::Bind(&RegisterJNI)) ||
-      !content::android::OnJNIOnLoadInit(base::Bind(&Init)))
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !content::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
-
+  }
   return JNI_VERSION_1_4;
 }

content/shell/android/shell_library_loader.cc

@@ -27,10 +27,13 @@ bool Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  if (!content::android::OnJNIOnLoadRegisterJNI(
-          vm, base::Bind(&RegisterJNI)) ||
-      !content::android::OnJNIOnLoadInit(base::Bind(&Init)))
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
+      !content::android::OnJNIOnLoadInit(init_callbacks)) {
     return -1;
-
+  }
   return JNI_VERSION_1_4;
 }