| Index: net/test/run_all_unittests.cc
|
| diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
|
| index 1067c21fd8ab37376b127779f6a41571a4cb2583..96e8a3c834625145110a1bd8590d3875abebbfd8 100644
|
| --- a/net/test/run_all_unittests.cc
|
| +++ b/net/test/run_all_unittests.cc
|
| @@ -13,8 +13,10 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/jni_android.h"
|
| +#include "base/android/jni_registrar.h"
|
| #include "base/test/test_file_util.h"
|
| #include "net/android/net_jni_registrar.h"
|
| +#include "url/android/url_jni_registrar.h"
|
| #endif
|
|
|
| #if !defined(OS_IOS)
|
| @@ -29,10 +31,18 @@ int main(int argc, char** argv) {
|
| base::StatisticsRecorder::Initialize();
|
|
|
| #if defined(OS_ANDROID)
|
| + const base::android::RegistrationMethod kNetTestRegisteredMethods[] = {
|
| + {"NetAndroid", net::android::RegisterJni},
|
| + {"TestFileUtil", file_util::RegisterContentUriTestUtils},
|
| + {"UrlAndroid", url::android::RegisterJni},
|
| + };
|
| +
|
| // Register JNI bindings for android. Doing it early as the test suite setup
|
| // may initiate a call to Java.
|
| - net::android::RegisterJni(base::android::AttachCurrentThread());
|
| - file_util::RegisterContentUriTestUtils(base::android::AttachCurrentThread());
|
| + base::android::RegisterNativeMethods(
|
| + base::android::AttachCurrentThread(),
|
| + kNetTestRegisteredMethods,
|
| + arraysize(kNetTestRegisteredMethods));
|
| #endif
|
|
|
| NetTestSuite test_suite(argc, argv);
|
|
|