| Index: chrome/android/shell/chrome_shell_test_entry_point.cc
|
| diff --git a/chrome/browser/android/chrome_entry_point.cc b/chrome/android/shell/chrome_shell_test_entry_point.cc
|
| similarity index 53%
|
| copy from chrome/browser/android/chrome_entry_point.cc
|
| copy to chrome/android/shell/chrome_shell_test_entry_point.cc
|
| index 4de58eff933427c67a8aba5a1625b29be319c960..e52ab1ce1bf575f97aecf4ea9b393549174f4ed9 100644
|
| --- a/chrome/browser/android/chrome_entry_point.cc
|
| +++ b/chrome/android/shell/chrome_shell_test_entry_point.cc
|
| @@ -3,25 +3,12 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/android/jni_android.h"
|
| -#include "base/bind.h"
|
| -#include "chrome/app/android/chrome_jni_onload.h"
|
| -
|
| -namespace {
|
| -
|
| -bool RegisterJNI(JNIEnv* env) {
|
| - return true;
|
| -}
|
| -
|
| -bool Init() {
|
| - return true;
|
| -}
|
| -
|
| -} // namespace
|
| +#include "net/test/android/net_test_jni_onload.h"
|
|
|
| // This is called by the VM when the shared library is first loaded.
|
| JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
|
| - if (!chrome::android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI)) ||
|
| - !chrome::android::OnJNIOnLoadInit(base::Bind(&Init))) {
|
| + if (!net::test::OnJNIOnLoadRegisterJNI(vm) ||
|
| + !net::test::OnJNIOnLoadInit()) {
|
| return -1;
|
| }
|
| return JNI_VERSION_1_4;
|
|
|