Separate OnJNIOnLoad

android_webview/lib/main/webview_jni_onload.cc

Index: android_webview/lib/main/webview_jni_onload.cc
diff --git a/android_webview/lib/main/webview_jni_onload_delegate.cc b/android_webview/lib/main/webview_jni_onload.cc
similarity index 82%
rename from android_webview/lib/main/webview_jni_onload_delegate.cc
rename to android_webview/lib/main/webview_jni_onload.cc
index 94be6ab334b2f170f3f42320ca57e9a7321c7df2..3e011903cb2dddcdf34012f5bc6b0b08db23c108 100644
--- a/android_webview/lib/main/webview_jni_onload_delegate.cc
+++ b/android_webview/lib/main/webview_jni_onload.cc
@@ -2,7 +2,7 @@
 // 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 "android_webview/lib/main/aw_main_delegate.h"
 #include "android_webview/native/android_webview_jni_registrar.h"
@@ -10,7 +10,6 @@
 #include "base/android/jni_registrar.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"
 
@@ -28,7 +27,7 @@ static base::android::RegistrationMethod
 
 }  // namespace
 
-bool WebViewJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
+bool RegisterJNI(JNIEnv* env) {
   // Register JNI for components we depend on.
   if (!RegisterNativeMethods(
           env,
@@ -40,7 +39,7 @@ bool WebViewJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
   return true;
 }
 
-bool WebViewJNIOnLoadDelegate::Init() {
+bool Init() {
   content::SetContentMainDelegate(new android_webview::AwMainDelegate());
 
   // Initialize url lib here while we are still single-threaded, in case we use
@@ -50,9 +49,4 @@ bool WebViewJNIOnLoadDelegate::Init() {
   return true;
 }
 
-bool OnJNIOnLoad(JavaVM* vm) {
-  WebViewJNIOnLoadDelegate delegate;
-  return content::android::OnJNIOnLoad(vm, &delegate);
-}
-
 }  // android_webview