| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <jni.h> | 5 #include <jni.h> |
| 6 | 6 |
| 7 #include "base/android/base_jni_registrar.h" | 7 #include "base/android/base_jni_registrar.h" |
| 8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_registrar.h" | 9 #include "base/android/jni_registrar.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "components/cronet/android/cronet_library_loader.h" | 11 #include "components/cronet/android/cronet_library_loader.h" |
| 12 #include "cronet_test_util.h" |
| 12 #include "cronet_url_request_context_config_test.h" | 13 #include "cronet_url_request_context_config_test.h" |
| 13 #include "mock_cert_verifier.h" | 14 #include "mock_cert_verifier.h" |
| 14 #include "mock_url_request_job_factory.h" | 15 #include "mock_url_request_job_factory.h" |
| 15 #include "native_test_server.h" | 16 #include "native_test_server.h" |
| 16 #include "network_change_notifier_util.h" | 17 #include "network_change_notifier_util.h" |
| 17 #include "quic_test_server.h" | 18 #include "quic_test_server.h" |
| 18 #include "sdch_test_util.h" | 19 #include "sdch_test_util.h" |
| 19 #include "test_upload_data_stream_handler.h" | 20 #include "test_upload_data_stream_handler.h" |
| 20 | 21 |
| 21 namespace { | 22 namespace { |
| 22 | 23 |
| 23 const base::android::RegistrationMethod kCronetTestsRegisteredMethods[] = { | 24 const base::android::RegistrationMethod kCronetTestsRegisteredMethods[] = { |
| 24 {"MockCertVerifier", cronet::RegisterMockCertVerifier}, | 25 {"MockCertVerifier", cronet::RegisterMockCertVerifier}, |
| 25 {"MockUrlRequestJobFactory", cronet::RegisterMockUrlRequestJobFactory}, | 26 {"MockUrlRequestJobFactory", cronet::RegisterMockUrlRequestJobFactory}, |
| 26 {"NativeTestServer", cronet::RegisterNativeTestServer}, | 27 {"NativeTestServer", cronet::RegisterNativeTestServer}, |
| 27 {"NetworkChangeNotifierUtil", cronet::RegisterNetworkChangeNotifierUtil}, | 28 {"NetworkChangeNotifierUtil", cronet::RegisterNetworkChangeNotifierUtil}, |
| 28 {"QuicTestServer", cronet::RegisterQuicTestServer}, | 29 {"QuicTestServer", cronet::RegisterQuicTestServer}, |
| 29 {"SdchTestUtil", cronet::RegisterSdchTestUtil}, | 30 {"SdchTestUtil", cronet::RegisterSdchTestUtil}, |
| 30 {"TestUploadDataStreamHandlerRegisterJni", | 31 {"TestUploadDataStreamHandlerRegisterJni", |
| 31 cronet::TestUploadDataStreamHandlerRegisterJni}, | 32 cronet::TestUploadDataStreamHandlerRegisterJni}, |
| 32 {"CronetUrlRequestContextConfigTest", | 33 {"CronetUrlRequestContextConfigTest", |
| 33 cronet::RegisterCronetUrlRequestContextConfigTest}, | 34 cronet::RegisterCronetUrlRequestContextConfigTest}, |
| 35 {"CronetTestUtil", cronet::RegisterCronetTestUtil}, |
| 34 }; | 36 }; |
| 35 | 37 |
| 36 } // namespace | 38 } // namespace |
| 37 | 39 |
| 38 // This is called by the VM when the shared library is first loaded. | 40 // This is called by the VM when the shared library is first loaded. |
| 39 // Checks the available version of JNI. Also, caches Java reflection artifacts. | 41 // Checks the available version of JNI. Also, caches Java reflection artifacts. |
| 40 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 42 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 41 JNIEnv* env; | 43 JNIEnv* env; |
| 42 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { | 44 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { |
| 43 return -1; | 45 return -1; |
| 44 } | 46 } |
| 45 | 47 |
| 46 jint cronet_onload = cronet::CronetOnLoad(vm, reserved); | 48 jint cronet_onload = cronet::CronetOnLoad(vm, reserved); |
| 47 if (cronet_onload == -1) | 49 if (cronet_onload == -1) |
| 48 return cronet_onload; | 50 return cronet_onload; |
| 49 | 51 |
| 50 if (!base::android::RegisterNativeMethods( | 52 if (!base::android::RegisterNativeMethods( |
| 51 env, | 53 env, |
| 52 kCronetTestsRegisteredMethods, | 54 kCronetTestsRegisteredMethods, |
| 53 arraysize(kCronetTestsRegisteredMethods))) { | 55 arraysize(kCronetTestsRegisteredMethods))) { |
| 54 return -1; | 56 return -1; |
| 55 } | 57 } |
| 56 return cronet_onload; | 58 return cronet_onload; |
| 57 } | 59 } |
| 58 | 60 |
| 59 extern "C" void JNI_OnUnLoad(JavaVM* vm, void* reserved) { | 61 extern "C" void JNI_OnUnLoad(JavaVM* vm, void* reserved) { |
| 60 cronet::CronetOnUnLoad(vm, reserved); | 62 cronet::CronetOnUnLoad(vm, reserved); |
| 61 } | 63 } |
| 62 | 64 |
| OLD | NEW |