1 files changed, 11 insertions, 3 deletions
diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc
index f320387f..88262c9 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -10,23 +10,31 @@
 #include "content/public/app/android_library_loader_hooks.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/android/shell_manager.h"
+#include "content/shell/shell.h"
 #include "content/shell/shell_main_delegate.h"
 
+static base::android::RegistrationMethod kRegistrationMethods[] = {
+    { "Shell", content::Shell::Register },
+    { "ShellManager", content::RegisterShellManager },
+};
+
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
-
   if (!content::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
   // 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))
+  if (!base::android::RegisterNativeMethods(env, kRegistrationMethods,
+                                            arraysize(kRegistrationMethods)))
     return -1;
 
   content::Compositor::Initialize();
+
   content::SetContentMainDelegate(new content::ShellMainDelegate());
+
   return JNI_VERSION_1_4;
 }