Separate OnJNIOnLoad

chrome/app/android/chrome_jni_onload.cc

Index: chrome/app/android/chrome_jni_onload.cc
diff --git a/chrome/app/android/chrome_jni_onload.cc b/chrome/app/android/chrome_jni_onload.cc
index 75afa88dcddde0613a659a66973145f1aa5399be..f0986ae7bc2a5b845fdf8c3adcfff032a549f6b6 100644
--- a/chrome/app/android/chrome_jni_onload.cc
+++ b/chrome/app/android/chrome_jni_onload.cc
@@ -3,23 +3,17 @@
 // found in the LICENSE file.
 
 #include "base/android/jni_android.h"
-#include "base/android/jni_onload_delegate.h"
+#include "base/bind.h"
 #include "chrome/app/android/chrome_android_initializer.h"
 #include "content/public/app/content_jni_onload.h"
 
 namespace {
 
-class ChromeJNIOnLoadDelegate : public base::android::JNIOnLoadDelegate {
- public:
-  bool RegisterJNI(JNIEnv* env) override;
-  bool Init() override;
-};
-
-bool ChromeJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
+bool RegisterJNI(JNIEnv* env) {
   return true;
 }
 
-bool ChromeJNIOnLoadDelegate::Init() {
+bool Init() {
   // TODO(michaelbai): Move the JNI registration from RunChrome() to
   // RegisterJNI().
   return RunChrome();
@@ -30,8 +24,9 @@ bool ChromeJNIOnLoadDelegate::Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  ChromeJNIOnLoadDelegate delegate;
-  if (!content::android::OnJNIOnLoad(vm, &delegate))
+  if (!content::android::OnJNIOnLoadRegisterJNI(
+          vm, base::Bind(&RegisterJNI)) ||
+      !content::android::OnJNIOnLoadInit(base::Bind(&Init)))
     return -1;
 
   return JNI_VERSION_1_4;