Separate OnJNIOnLoad

content/shell/android/shell_library_loader.cc

Index: content/shell/android/shell_library_loader.cc
diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc
index 6d80fc3a85cb97b2c09843d0b28f48cdb091ecf9..2300b2b9446ff301d0820695f2732c530fc359f3 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -14,27 +14,25 @@ namespace {
 
 class ShellJNIOnLoadDelegate : public base::android::JNIOnLoadDelegate {
  public:
-  bool RegisterJNI(JNIEnv* env) override;
-  bool Init() override;
+  bool RegisterJNI(JNIEnv* env) override  {
+    return content::android::RegisterShellJni(env);
+  }
+
+  bool Init() override  {
+    content::Compositor::Initialize();
+    content::SetContentMainDelegate(new content::ShellMainDelegate());
+    return true;
+  }
 };
 
-bool ShellJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
-  return content::android::RegisterShellJni(env);
-}
-
-bool ShellJNIOnLoadDelegate::Init() {
-  content::Compositor::Initialize();
-  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) {
   ShellJNIOnLoadDelegate delegate;
-  if (!content::android::OnJNIOnLoad(vm, &delegate))
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm, &delegate) ||
+      !content::android::OnJNIOnLoadInit(&delegate))
     return -1;
 
   return JNI_VERSION_1_4;