Remove JNI onload callback vector construction in favour of direct calls.

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 d9b3d28b229148bbdc67e17b81ca47ce15a679d1..c48ae4aeb3e039ce61c8032fbe465a949ca0097e 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/android/jni_android.h"
+#include "base/android/library_loader/library_loader_hooks.h"
 #include "base/bind.h"
 #include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
@@ -12,11 +13,15 @@
 
 namespace {
 
-bool RegisterJNI(JNIEnv* env) {
-  return content::android::RegisterShellJni(env);
+bool RegisterJNI() {
+  return content::android::RegisterShellJni(
+      base::android::AttachCurrentThread());
 }
 
-bool Init() {
+bool NativeInit() {
+  if (!content::android::OnJNIOnLoadInit())
+    return false;
+
   content::Compositor::Initialize();
   content::SetContentMainDelegate(new content::ShellMainDelegate());
   return true;
@@ -27,12 +32,8 @@ bool Init() {
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  std::vector<base::android::RegisterCallback> register_callbacks;
-  register_callbacks.push_back(base::Bind(&RegisterJNI));
-  std::vector<base::android::InitCallback> init_callbacks;
-  init_callbacks.push_back(base::Bind(&Init));
-  if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
-      !content::android::OnJNIOnLoadInit(init_callbacks)) {
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm) || !RegisterJNI() ||
+      !NativeInit()) {
     return -1;
   }
   return JNI_VERSION_1_4;