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

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

Issue 802293002: Revert of Stub for web-base client for DevTools bridge and tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « components/devtools_bridge/test/android/client/web_client_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 49fde3a2aa0f60cbd25c1c3b6b53b957cea06ce9..8fc7480088329a336ef762076048b5e7b4cf6c55 100644
--- a/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
+++ b/components/devtools_bridge/test/android/javatests/jni/jni_onload.cc
@@ -12,11 +12,15 @@
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
base::android::InitVM(vm);
JNIEnv* env = base::android::AttachCurrentThread();
- if (!base::android::RegisterLibraryLoaderEntryHook(env) ||
- !base::android::RegisterJni(env) ||
- !SessionDependencyFactoryAndroid::InitializeSSL() ||
- !SessionDependencyFactoryAndroid::RegisterNatives(env)) {
+ if (!base::android::RegisterLibraryLoaderEntryHook(env)) {
return -1;
}
+ if (!base::android::RegisterJni(env)) {
+ return -1;
+ }
+ if (!SessionDependencyFactoryAndroid::InitializeSSL()) {
+ return -1;
+ }
+ SessionDependencyFactoryAndroid::RegisterNatives(env);
return JNI_VERSION_1_4;
}
« no previous file with comments | « components/devtools_bridge/test/android/client/web_client_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698