Separate OnJNIOnLoad

content/public/app/content_jni_onload.h

Index: content/public/app/content_jni_onload.h
diff --git a/content/public/app/content_jni_onload.h b/content/public/app/content_jni_onload.h
index de2de3abbc8648fd2f205f7578aef3976ab395ab..2f3ee663f9c15138db75b76bef565b85dc804418 100644
--- a/content/public/app/content_jni_onload.h
+++ b/content/public/app/content_jni_onload.h
@@ -7,24 +7,19 @@
 
 #include <jni.h>
 
+#include "base/android/base_jni_onload.h"
 #include "content/common/content_export.h"
 
-namespace base {
-namespace android {
-
-class JNIOnLoadDelegate;
-
-}  // namespace android
-}  // namespace base
-
 namespace content {
 namespace android {
 
-// Returns true if JNI registration and initialization succeeded. Refer to
-// JNIOnLoadDelegate for more information.
-CONTENT_EXPORT bool OnJNIOnLoad(
+// Returns true if JNI registration succeeded.
+CONTENT_EXPORT bool OnJNIOnLoadRegisterJNI(
     JavaVM* vm,
-    base::android::JNIOnLoadDelegate* delegate);
+    base::android::RegisterCallback callback);
+
+// Returns true if initialization succeeded.
+CONTENT_EXPORT bool OnJNIOnLoadInit(base::android::InitCallback callback);
 
 }  // namespace android
 }  // namespace content