Separate OnJNIOnLoad

android_webview/lib/main/webview_entry_point.cc

Index: android_webview/lib/main/webview_entry_point.cc
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index 7de575a6e1c8ab6ca99e18726c6dcfc0937537e8..44135b74fc5d34dae481769d2382691f5db04531 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/lib/main/webview_jni_onload_delegate.h"
+#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) {
-  if (!android_webview::OnJNIOnLoad(vm))
+  if (!content::android::OnJNIOnLoadRegisterJNI(
+          vm, base::Bind(&android_webview::RegisterJNI)) ||
+      !content::android::OnJNIOnLoadInit(base::Bind(&android_webview::Init)))
     return -1;
 
   return JNI_VERSION_1_4;