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..8948b5ba13c7e40fe72ede1c24f1f009e0d50163 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
@@ -16,28 +16,26 @@ namespace {
 class ContentBrowserTestsJNIOnLoadDelegate :
       public base::android::JNIOnLoadDelegate {
  public:
-  bool RegisterJNI(JNIEnv* env) override;
-  bool Init() override;
+  bool RegisterJNI(JNIEnv* env) override  {
+    return content::android::RegisterShellJni(env) &&
+        content::NestedMessagePumpAndroid::RegisterJni(env) &&
+        content::RegisterContentBrowserTestsAndroid(env);
+  }
+
+  bool Init() override {
+    content::SetContentMainDelegate(new content::ShellMainDelegate());
+    return true;
+  }
 };
 
-bool ContentBrowserTestsJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
-  return content::android::RegisterShellJni(env) &&
-      content::NestedMessagePumpAndroid::RegisterJni(env) &&
-      content::RegisterContentBrowserTestsAndroid(env);
-}
-
-bool ContentBrowserTestsJNIOnLoadDelegate::Init() {
-  content::SetContentMainDelegate(new content::ShellMainDelegate());
-  return true;
-}
-
 }  // namespace
 
 
 // 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, &delegate) ||
+      !content::android::OnJNIOnLoadInit(&delegate))
     return -1;
 
   return JNI_VERSION_1_4;