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

remoting/client/jni/remoting_jni_onload.cc

Index: remoting/client/jni/remoting_jni_onload.cc
diff --git a/remoting/client/jni/remoting_jni_onload.cc b/remoting/client/jni/remoting_jni_onload.cc
index 2140e4a186da5bf012445f478349526612fef205..dd73922a0ec892aaa4462b8cfe87ff0a78cd0771 100644
--- a/remoting/client/jni/remoting_jni_onload.cc
+++ b/remoting/client/jni/remoting_jni_onload.cc
@@ -22,19 +22,17 @@ base::android::RegistrationMethod kRemotingRegisteredMethods[] = {
   {"remoting", remoting::RegisterJni},
 };
 
-bool RegisterJNI(JNIEnv* env) {
-  return base::android::RegisterNativeMethods(env,
-      kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods));
+bool RegisterJNI() {
+  return base::android::RegisterNativeMethods(
+      base::android::AttachCurrentThread(), kRemotingRegisteredMethods,
+      arraysize(kRemotingRegisteredMethods));
 }
 
 }  // namespace
 
 JNIEXPORT 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;
-  if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
-      !base::android::OnJNIOnLoadInit(init_callbacks)) {
+  if (!base::android::OnJNIOnLoadRegisterJNI(vm) || !RegisterJNI() ||
+      !base::android::OnJNIOnLoadInit()) {
     return -1;
   }
   return JNI_VERSION_1_4;