| 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 "net/test/android/net_test_jni_onload.h" | 5 #include "net/test/android/net_test_jni_onload.h" |
| 6 | 6 |
| 7 #include "base/android/base_jni_onload.h" | 7 #include "base/android/base_jni_onload.h" |
| 8 #include "base/android/base_jni_registrar.h" | 8 #include "base/android/base_jni_registrar.h" |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "net/test/embedded_test_server/android/embedded_test_server_android.h" | 11 #include "net/test/embedded_test_server/android/embedded_test_server_android.h" |
| 12 | 12 |
| 13 namespace net { | 13 namespace net { |
| 14 namespace test { | 14 namespace test { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 bool RegisterJNI(JNIEnv* env) { | 18 bool RegisterJNI(JNIEnv* env) { |
| 19 return net::test_server::EmbeddedTestServerAndroid:: | 19 return net::test_server::EmbeddedTestServerAndroid:: |
| 20 RegisterEmbeddedTestServerAndroid(env); | 20 RegisterEmbeddedTestServerAndroid(env); |
| 21 } | 21 } |
| 22 | 22 |
| 23 } // namesapce | 23 } // namesapce |
| 24 | 24 |
| 25 bool OnJNIOnLoadRegisterJNI(JNIEnv* env) { | 25 bool OnJNIOnLoadRegisterJNI(JNIEnv* env) { |
| 26 return base::android::OnJNIOnLoadRegisterJNI(env) && | 26 return base::android::RegisterJni(env) && RegisterJNI(env); |
| 27 base::android::RegisterJni(env) && RegisterJNI(env); | |
| 28 } | 27 } |
| 29 | 28 |
| 30 bool OnJNIOnLoadInit() { | 29 bool OnJNIOnLoadInit() { |
| 31 return base::android::OnJNIOnLoadInit(); | 30 return base::android::OnJNIOnLoadInit(); |
| 32 } | 31 } |
| 33 | 32 |
| 34 } // namespace test | 33 } // namespace test |
| 35 } // namespace net | 34 } // namespace net |
| OLD | NEW |