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

components/cronet/android/cronet_library_loader.cc

 // Copyright 2014 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 "components/cronet/android/cronet_library_loader.h"
 
 #include <jni.h>
 #include <vector>
 
 #include "base/android/base_jni_onload.h"
@@ skipping 45 matching lines @@
 // notifications generally live.
 base::MessageLoop* g_main_message_loop = nullptr;
 
 net::NetworkChangeNotifier* g_network_change_notifier = nullptr;
 
 bool RegisterJNI(JNIEnv* env) {
   return base::android::RegisterNativeMethods(
       env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods));
 }
 
-bool Init() {
+bool NativeInit() {
+  if (!base::android::OnJNIOnLoadInit())
+    return false;
   url::Initialize();
   return true;
 }
 
 }  // namespace
 
 // Checks the available version of JNI. Also, caches Java reflection artifacts.
 jint CronetOnLoad(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 (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
-      !base::android::OnJNIOnLoadInit(init_callbacks)) {
+  base::android::InitVM(vm);
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (!base::android::OnJNIOnLoadRegisterJNI(env) || !RegisterJNI(env) ||
+      !NativeInit()) {
     return -1;
   }
   return JNI_VERSION_1_6;
 }
 
 void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
   base::android::LibraryLoaderExitHook();
 }
 
 void CronetInitOnMainThread(JNIEnv* env, const JavaParamRef<jclass>& jcaller) {
@@ skipping 15 matching lines @@
   g_network_change_notifier = net::NetworkChangeNotifier::Create();
 }
 
 ScopedJavaLocalRef<jstring> GetCronetVersion(
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller) {
   return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION);
 }
 
 }  // namespace cronet