Separate JNI registration with initialization

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 142d9efcd45c4d574fd1d96d8edba0c94ed9937f..6d80fc3a85cb97b2c09843d0b28f48cdb091ecf9 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -3,34 +3,39 @@
 // found in the LICENSE file.
 
 #include "base/android/jni_android.h"
-#include "base/android/jni_registrar.h"
-#include "base/android/library_loader/library_loader_hooks.h"
-#include "base/basictypes.h"
-#include "base/debug/debugger.h"
-#include "base/logging.h"
-#include "content/public/app/android_library_loader_hooks.h"
+#include "base/android/jni_onload_delegate.h"
+#include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "content/shell/app/shell_main_delegate.h"
 
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+namespace {
 
-  base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
+class ShellJNIOnLoadDelegate : public base::android::JNIOnLoadDelegate {
+ public:
+  bool RegisterJNI(JNIEnv* env) override;
+  bool Init() override;
+};
 
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
+bool ShellJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
+  return content::android::RegisterShellJni(env);
+}
 
-  if (!base::android::RegisterLibraryLoaderEntryHook(env))
-    return -1;
+bool ShellJNIOnLoadDelegate::Init() {
+  content::Compositor::Initialize();
+  content::SetContentMainDelegate(new content::ShellMainDelegate());
+  return true;
+}
 
-  // To be called only from the UI thread.  If loading the library is done on
-  // a separate thread, this should be moved elsewhere.
-  if (!content::android::RegisterShellJni(env))
+}  // 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))
     return -1;
 
-  content::Compositor::Initialize();
-  content::SetContentMainDelegate(new content::ShellMainDelegate());
   return JNI_VERSION_1_4;
 }