Separate OnJNIOnLoad

content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc

Index: content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
index 3f62c3477b588403acf5e08f96d5e12bc81d3b32..fc0a37b0ac767fd980f95fb6f546311be7797124 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/android/jni_android.h"
-#include "base/android/jni_onload_delegate.h"
+#include "base/bind.h"
 #include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
 #include "content/public/test/nested_message_pump_android.h"
@@ -13,20 +13,13 @@
 
 namespace {
 
-class ContentBrowserTestsJNIOnLoadDelegate :
-      public base::android::JNIOnLoadDelegate {
- public:
-  bool RegisterJNI(JNIEnv* env) override;
-  bool Init() override;
-};
-
-bool ContentBrowserTestsJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
+bool RegisterJNI(JNIEnv* env) {
   return content::android::RegisterShellJni(env) &&
       content::NestedMessagePumpAndroid::RegisterJni(env) &&
       content::RegisterContentBrowserTestsAndroid(env);
 }
 
-bool ContentBrowserTestsJNIOnLoadDelegate::Init() {
+bool Init() {
   content::SetContentMainDelegate(new content::ShellMainDelegate());
   return true;
 }
@@ -36,8 +29,9 @@ bool ContentBrowserTestsJNIOnLoadDelegate::Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  ContentBrowserTestsJNIOnLoadDelegate 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;