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

base/android/base_jni_onload.cc

Index: base/android/base_jni_onload.cc
diff --git a/base/android/base_jni_onload.cc b/base/android/base_jni_onload.cc
index 7ab4982c427276ac438ff0b2adabe46ca4cfc1da..7d6a9169666a8cbdeec8002f062f5f57f88e956b 100644
--- a/base/android/base_jni_onload.cc
+++ b/base/android/base_jni_onload.cc
@@ -12,13 +12,13 @@
 namespace base {
 namespace android {
 
-namespace {
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm) {
+  base::android::InitVM(vm);

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

Rather than passing JavaVM down through the RegisterJNI sequence we should just
call InitVM and AttachCurrentThread in each JNI_OnLoad and then pass the JNIEnv
down through RegisterJNI instead.

We always need to do InitVM even if we don't need JNI registration, I think it
makes most sense to just do it at the top level even though that means
duplicating it, it's just a single line.

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

Done.

 
-bool RegisterJNI(JNIEnv* env) {
-  return RegisterLibraryLoaderEntryHook(env);
+  return RegisterLibraryLoaderEntryHook(base::android::AttachCurrentThread());
 }
 
-bool Init() {
+bool OnJNIOnLoadInit() {
   InitAtExitManager();
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::InitReplacementClassLoader(env,
@@ -26,32 +26,5 @@ bool Init() {
   return true;
 }
 
-}  // namespace
-
-
-bool OnJNIOnLoadRegisterJNI(JavaVM* vm,
-                            std::vector<RegisterCallback> callbacks) {
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
-
-  callbacks.push_back(base::Bind(&RegisterJNI));
-  for (std::vector<RegisterCallback>::reverse_iterator i =
-           callbacks.rbegin(); i != callbacks.rend(); ++i) {
-    if (!i->Run(env))
-      return false;
-  }
-  return true;
-}
-
-bool OnJNIOnLoadInit(std::vector<InitCallback> callbacks) {
-  callbacks.push_back(base::Bind(&Init));
-  for (std::vector<InitCallback>::reverse_iterator i =
-           callbacks.rbegin(); i != callbacks.rend(); ++i) {
-    if (!i->Run())
-      return false;
-  }
-  return true;
-}
-
 }  // namespace android
 }  // namespace base