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

components/cronet/android/test/cronet_test_jni.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 <jni.h>
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 18 matching lines @@
     {"NativeTestServer", cronet::RegisterNativeTestServer},
     {"QuicTestServer", cronet::RegisterQuicTestServer},
     {"SdchTestUtil", cronet::RegisterSdchTestUtil},
     {"TestUploadDataStreamHandlerRegisterJni",
      cronet::TestUploadDataStreamHandlerRegisterJni},
     {"CronetUrlRequestContextConfigTest",
      cronet::RegisterCronetUrlRequestContextConfigTest},
     {"CronetTestUtil", cronet::TestUtil::Register},
 };
 
+bool NativeInit() {

[Torne, 2017/01/12 13:33:53]

Seems inconsistent with other usage to do RegisterNativeMethods in here. I
realise the original file did it in this order, but it seems better to just
leave things arranged as they are here?

[Tobias Sargeant, 2017/01/12 14:27:56]

Done.

+  if (!base::android::OnJNIOnLoadInit())
+    return false;
+
+  if (!base::android::RegisterNativeMethods(
+          base::android::AttachCurrentThread(), kCronetTestsRegisteredMethods,
+          arraysize(kCronetTestsRegisteredMethods))) {
+    return false;
+  }
+  return true;
+}
+
 }  // namespace
 
 // This is called by the VM when the shared library is first loaded.
 // Checks the available version of JNI. Also, caches Java reflection artifacts.
 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   JNIEnv* env;
   if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
     return -1;
   }
 
-  std::vector<base::android::RegisterCallback> register_callbacks;
-  std::vector<base::android::InitCallback> init_callbacks;
-  if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
-      !base::android::OnJNIOnLoadInit(init_callbacks)) {
+  if (!base::android::OnJNIOnLoadRegisterJNI(vm) || !NativeInit()) {
     return -1;
   }
 
-  if (!base::android::RegisterNativeMethods(
-          env,
-          kCronetTestsRegisteredMethods,
-          arraysize(kCronetTestsRegisteredMethods))) {
-    return -1;
-  }
   return JNI_VERSION_1_6;
 }
 
 extern "C" void JNI_OnUnLoad(JavaVM* vm, void* reserved) {
   base::android::LibraryLoaderExitHook();
 }
-