| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/android/base_jni_onload.h" | 5 #include "base/android/base_jni_onload.h" |
| 6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "testing/android/native_test_launcher.h" | 8 #include "testing/android/native_test/native_test_launcher.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| 11 | 11 |
| 12 bool RegisterJNI(JNIEnv* env) { | 12 bool RegisterJNI(JNIEnv* env) { |
| 13 return RegisterNativeTestJNI(env); | 13 return RegisterNativeTestJNI(env); |
| 14 } | 14 } |
| 15 | 15 |
| 16 bool Init() { | 16 bool Init() { |
| 17 InstallHandlers(); | 17 InstallHandlers(); |
| 18 return true; | 18 return true; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 29 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks)) | 29 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks)) |
| 30 return -1; | 30 return -1; |
| 31 | 31 |
| 32 std::vector<base::android::InitCallback> init_callbacks; | 32 std::vector<base::android::InitCallback> init_callbacks; |
| 33 init_callbacks.push_back(base::Bind(&Init)); | 33 init_callbacks.push_back(base::Bind(&Init)); |
| 34 if (!base::android::OnJNIOnLoadInit(init_callbacks)) | 34 if (!base::android::OnJNIOnLoadInit(init_callbacks)) |
| 35 return -1; | 35 return -1; |
| 36 | 36 |
| 37 return JNI_VERSION_1_4; | 37 return JNI_VERSION_1_4; |
| 38 } | 38 } |
| OLD | NEW |