Refactoring devtools_bridge JNI_OnLoad

components/devtools_bridge/test/android/javatests/jni/jni_onload.cc

Index: components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
diff --git a/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc b/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
index f156aed51c6cb87879d5286eeab80068e5d1965b..4238dec4240e347b93e445377f8fb1d240457361 100644
--- a/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
+++ b/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
@@ -2,20 +2,36 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/android/base_jni_onload.h"
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
-#include "base/android/library_loader/library_loader_hooks.h"
-#include "components/devtools_bridge/android/component_loader.h"
+#include "base/bind.h"
+#include "components/devtools_bridge/android/apiary_client_factory.h"
+#include "components/devtools_bridge/android/session_dependency_factory_android.h"
+
+namespace {
 
 using namespace devtools_bridge::android;
 
+bool RegisterJNI(JNIEnv* env) {
+  return base::android::RegisterJni(env) &&
+      SessionDependencyFactoryAndroid::RegisterNatives(env) &&
+      ApiaryClientFactory::RegisterNatives(env);
+}
+
+bool Init() {
+  return devtools_bridge::SessionDependencyFactory::InitializeSSL();
+}
+
+}  // namespace
+
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
-  if (!base::android::RegisterLibraryLoaderEntryHook(env)) {
-    return -1;
-  }
-  if (!ComponentLoader::OnLoad(env)) {
+  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)) {
     return -1;
   }
   return JNI_VERSION_1_4;