Relanding "Add apk for running content_browsertests"

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 88262c925a0ca93c694b28e8b47a112b7cb86f6e..f320387fe8060f96ea5dce3f522038ac8ea3d5b6 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -10,31 +10,23 @@
 #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_manager.h"
-#include "content/shell/shell.h"
+#include "content/shell/android/shell_jni_registrar.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 (!base::android::RegisterNativeMethods(env, kRegistrationMethods,
-                                            arraysize(kRegistrationMethods)))
+  if (!content::android::RegisterShellJni(env))
     return -1;
 
   content::Compositor::Initialize();
-
   content::SetContentMainDelegate(new content::ShellMainDelegate());
-
   return JNI_VERSION_1_4;
 }