Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: components/devtools_bridge/test/android/javatests/jni/jni_onload.cc

Issue 716433003: Continue impementation SessionDependencyFactoryNative. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native-factory
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 36dcdc8cc77c68bfe184539aee36a6ad866f5719..8fc7480088329a336ef762076048b5e7b4cf6c55 100644
--- a/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
+++ b/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
@@ -5,7 +5,7 @@
#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/session_dependency_factory_native.h"
+#include "components/devtools_bridge/android/session_dependency_factory_android.h"
using namespace devtools_bridge::android;
@@ -18,7 +18,9 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
if (!base::android::RegisterJni(env)) {
return -1;
}
-
- SessionDependencyFactoryNative::RegisterNatives(env);
+ if (!SessionDependencyFactoryAndroid::InitializeSSL()) {
+ return -1;
+ }
+ SessionDependencyFactoryAndroid::RegisterNatives(env);
return JNI_VERSION_1_4;
}

Powered by Google App Engine
This is Rietveld 408576698