Chromium Code Reviews| Index: components/cronet/android/cronet_loader.cc |
| diff --git a/components/cronet/android/cronet_jni.cc b/components/cronet/android/cronet_loader.cc |
| similarity index 92% |
| copy from components/cronet/android/cronet_jni.cc |
| copy to components/cronet/android/cronet_loader.cc |
| index 7ebd14131469e7035f7f10c2e1426c3d13133063..779b3d38a84341cc051d30df9abacbbf1cb088f4 100644 |
| --- a/components/cronet/android/cronet_jni.cc |
| +++ b/components/cronet/android/cronet_loader.cc |
| @@ -30,8 +30,9 @@ base::AtExitManager* g_at_exit_manager = NULL; |
| } // namespace |
| +namespace cronet { |
|
mmenke
2014/09/11 18:05:24
Suggest moving the anonymous inside the cronet nam
mef
2014/09/11 18:37:54
Done.
|
| // Checks the available version of JNI. Also, caches Java reflection artifacts. |
| -extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| +jint CronetOnLoad(JavaVM* vm, void* reserved) { |
| JNIEnv* env; |
| if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { |
| return -1; |
| @@ -55,10 +56,11 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| return JNI_VERSION_1_6; |
| } |
| -extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { |
| +void CronetOnUnLoad(JavaVM* jvm, void* reserved) { |
| if (g_at_exit_manager) { |
| delete g_at_exit_manager; |
| g_at_exit_manager = NULL; |
| } |
| } |
| +} // namespace cronet |