refactoring Android Webview JNI_OnLoad interface to make it consistent with others.

BUG=464008

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

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

android_webview/lib/main/webview_entry_point.cc

@@ -4,22 +4,23 @@
 
 #include "android_webview/lib/main/webview_jni_onload.h"
 #include "base/android/jni_android.h"
-#include "base/bind.h"
-#include "content/public/app/content_jni_onload.h"
 
 // This is called by the VM when the shared library is first loaded.
 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  // WebView uses native JNI exports; disable manual JNI registration to
-  // improve startup peformance.
+  // WebView uses native JNI exports; disable manual JNI registration because
+  // we don't have a good way to detect the JNI registrations which is called,
+  // outside of OnJNIOnLoadRegisterJNI code path.
   base::android::DisableManualJniRegistration();
 
-  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)) {
+  if (base::android::IsManualJniRegistrationDisabled()) {
+    base::android::InitVM(vm);
+  } else {
+    if (android_webview::OnJNIOnLoadRegisterJNI(vm))
+      return -1;
+  }
+
+  if (!android_webview::OnJNIOnLoadInit()) {
     return -1;
   }
   return JNI_VERSION_1_4;

android_webview/lib/main/webview_jni_onload.cc

@@ -8,8 +8,10 @@
 #include "android_webview/native/android_webview_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "base/bind.h"
 #include "components/navigation_interception/component_jni_registrar.h"
 #include "components/web_contents_delegate_android/component_jni_registrar.h"
+#include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
 #include "url/url_util.h"
 
@@ -25,8 +27,6 @@ static base::android::RegistrationMethod
         web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni },
 };
 
-}  // namespace
-
 bool RegisterJNI(JNIEnv* env) {
   // Register JNI for components we depend on.
   if (!RegisterNativeMethods(
@@ -49,4 +49,18 @@ bool Init() {
   return true;
 }
 
+}  // namespace
+
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm) {
+  std::vector<base::android::RegisterCallback> register_callbacks;
+  register_callbacks.push_back(base::Bind(&RegisterJNI));
+  return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks);
+}
+
+bool OnJNIOnLoadInit() {
+  std::vector<base::android::InitCallback> init_callbacks;
+  init_callbacks.push_back(base::Bind(&Init));
+  return content::android::OnJNIOnLoadInit(init_callbacks);
+}
+
 }  // android_webview

android_webview/lib/main/webview_jni_onload.h

@@ -9,8 +9,11 @@
 
 namespace android_webview {
 
-bool RegisterJNI(JNIEnv* env);
-bool Init();
+// TODO(michaelbai): remove this once we no longer need to be able to run
+// webview with manual JNI registration
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm);
+
+bool OnJNIOnLoadInit();
 
 }  // android_webview