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

content/app/android/content_jni_onload.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_jni_onload.h"
 
 #include <vector>
 
 #include "base/android/base_jni_onload.h"
+#include "base/android/jni_android.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/bind.h"
 #include "content/app/android/library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 
 namespace content {
 namespace android {
 
-namespace {
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm) {
+  if (!base::android::OnJNIOnLoadRegisterJNI(vm))
+    return false;
 
-bool RegisterJNI(JNIEnv* env) {
-  return content::EnsureJniRegistered(env);
+  return content::EnsureJniRegistered(base::android::AttachCurrentThread());
 }
 
-bool Init() {
+bool OnJNIOnLoadInit() {
+  if (!base::android::OnJNIOnLoadInit())
+    return false;
+
   base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
   return true;
 }
 
-}  // namespace
-
-
-bool OnJNIOnLoadRegisterJNI(
-    JavaVM* vm,
-    std::vector<base::android::RegisterCallback> callbacks) {
-  callbacks.push_back(base::Bind(&RegisterJNI));
-  return base::android::OnJNIOnLoadRegisterJNI(vm, callbacks);
-}
-
-bool OnJNIOnLoadInit(
-    std::vector<base::android::InitCallback> callbacks) {
-  callbacks.push_back(base::Bind(&Init));
-  return base::android::OnJNIOnLoadInit(callbacks);
-}
-
 }  // namespace android
 }  // namespace content