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

net/test/android/net_test_jni_onload.cc

Index: net/test/android/net_test_jni_onload.cc
diff --git a/net/test/android/net_test_jni_onload.cc b/net/test/android/net_test_jni_onload.cc
index 6f3db27382194e63b06e362e3f0b0052929e2de4..a1b425c8977770e715cbd98064a6e4d85a3895be 100644
--- a/net/test/android/net_test_jni_onload.cc
+++ b/net/test/android/net_test_jni_onload.cc
@@ -6,6 +6,7 @@
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
+#include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "net/test/embedded_test_server/android/embedded_test_server_android.h"
 
@@ -19,23 +20,17 @@ bool RegisterJNI(JNIEnv* env) {
       RegisterEmbeddedTestServerAndroid(env);
 }
 
-bool Init() {
-  return true;
-}
-
 }  // namesapce
 
 bool OnJNIOnLoadRegisterJNI(JavaVM* vm) {
-  std::vector<base::android::RegisterCallback> register_callbacks;
-  register_callbacks.push_back(base::Bind(&RegisterJNI));
-  register_callbacks.push_back(base::Bind(&base::android::RegisterJni));
-  return base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks);
+  if (!base::android::OnJNIOnLoadRegisterJNI(vm))
+    return false;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return base::android::RegisterJni(env) && RegisterJNI(env);
 }
 
 bool OnJNIOnLoadInit() {
-  std::vector<base::android::InitCallback> init_callbacks;
-  init_callbacks.push_back(base::Bind(&Init));
-  return base::android::OnJNIOnLoadInit(init_callbacks);
+  return base::android::OnJNIOnLoadInit();
 }
 
 }  // namespace test