| 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 8fc7480088329a336ef762076048b5e7b4cf6c55..49fde3a2aa0f60cbd25c1c3b6b53b957cea06ce9 100644
|
| --- a/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
|
| +++ b/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
|
| @@ -12,15 +12,11 @@ using namespace devtools_bridge::android;
|
| JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
| base::android::InitVM(vm);
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - if (!base::android::RegisterLibraryLoaderEntryHook(env)) {
|
| + if (!base::android::RegisterLibraryLoaderEntryHook(env) ||
|
| + !base::android::RegisterJni(env) ||
|
| + !SessionDependencyFactoryAndroid::InitializeSSL() ||
|
| + !SessionDependencyFactoryAndroid::RegisterNatives(env)) {
|
| return -1;
|
| }
|
| - if (!base::android::RegisterJni(env)) {
|
| - return -1;
|
| - }
|
| - if (!SessionDependencyFactoryAndroid::InitializeSSL()) {
|
| - return -1;
|
| - }
|
| - SessionDependencyFactoryAndroid::RegisterNatives(env);
|
| return JNI_VERSION_1_4;
|
| }
|
|
|