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

chrome/app/android/chrome_jni_onload.cc

 // Copyright (c) 2012 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 "chrome/app/android/chrome_jni_onload.h"
 
+#include "base/android/jni_android.h"
 #include "base/android/library_loader/library_loader_hooks.h"
-#include "base/bind.h"
 #include "chrome/app/android/chrome_android_initializer.h"
 #include "chrome/browser/android/chrome_jni_registrar.h"
 #include "content/public/app/content_jni_onload.h"
 
 namespace android {
 
-namespace {
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm) {
+  if (!content::android::OnJNIOnLoadRegisterJNI(vm))
+    return false;
 
-bool RegisterJNI(JNIEnv* env) {
+  JNIEnv* env = base::android::AttachCurrentThread();
   if (base::android::GetLibraryProcessType(env) ==
       base::android::PROCESS_BROWSER) {
     return RegisterBrowserJNI(env);
   }
   return true;
 }
 
-bool Init() {
+bool OnJNIOnLoadInit() {
+  if (!content::android::OnJNIOnLoadInit())
+    return false;
+
   return RunChrome();
 }
 
-}  // namespace
-
-bool OnJNIOnLoadRegisterJNI(
-    JavaVM* vm,
-    base::android::RegisterCallback callback) {
-  std::vector<base::android::RegisterCallback> register_callbacks;
-  register_callbacks.push_back(callback);
-  register_callbacks.push_back(base::Bind(&RegisterJNI));
-  return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks);
-}
-
-bool OnJNIOnLoadInit(base::android::InitCallback callback) {
-  std::vector<base::android::InitCallback> init_callbacks;
-  init_callbacks.push_back(callback);
-  init_callbacks.push_back(base::Bind(&Init));
-  return content::android::OnJNIOnLoadInit(init_callbacks);
-}
-
 }  // namespace android