Index: testing/android/native_test_jni_onload.cc |
diff --git a/testing/android/native_test_jni_onload.cc b/testing/android/native_test_jni_onload.cc |
index de42356d08c6b3228d2e651c0c84cd480f446a01..bfab3c9933b689300763a4fc03cc60fa5394b158 100644 |
--- a/testing/android/native_test_jni_onload.cc |
+++ b/testing/android/native_test_jni_onload.cc |
@@ -4,16 +4,22 @@ |
#include "base/android/base_jni_onload.h" |
#include "base/android/jni_android.h" |
-#include "base/bind.h" |
+#include "base/android/jni_onload_delegate.h" |
#include "testing/android/native_test_launcher.h" |
namespace { |
-bool RegisterJNI(JNIEnv* env) { |
+class NativeTestJNIOnLoadDelegate : public base::android::JNIOnLoadDelegate { |
+ public: |
+ bool RegisterJNI(JNIEnv* env) override; |
+ bool Init() override; |
+}; |
+ |
+bool NativeTestJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) { |
return RegisterNativeTestJNI(env); |
} |
-bool Init() { |
+bool NativeTestJNIOnLoadDelegate::Init() { |
InstallHandlers(); |
return true; |
} |
@@ -23,15 +29,11 @@ bool Init() { |
// This is called by the VM when the shared library is first loaded. |
JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
- std::vector<base::android::RegisterCallback> register_callbacks; |
- register_callbacks.push_back(base::Bind(&RegisterJNI)); |
- |
- if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks)) |
- return -1; |
+ NativeTestJNIOnLoadDelegate delegate; |
+ std::vector<base::android::JNIOnLoadDelegate*> delegates; |
+ delegates.push_back(&delegate); |
- std::vector<base::android::InitCallback> init_callbacks; |
- init_callbacks.push_back(base::Bind(&Init)); |
- if (!base::android::OnJNIOnLoadInit(init_callbacks)) |
+ if (!base::android::OnJNIOnLoad(vm, &delegates)) |
return -1; |
return JNI_VERSION_1_4; |