diff options
Diffstat (limited to 'testing/android/native_test_launcher.cc')
| -rw-r--r-- | testing/android/native_test_launcher.cc | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc index dad604b..b88cb30 100644 --- a/testing/android/native_test_launcher.cc +++ b/testing/android/native_test_launcher.cc @@ -13,9 +13,10 @@ #include <signal.h> #include <stdio.h> -#include "base/android/base_jni_registrar.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" +#include "base/android/locale_utils.h" +#include "base/android/path_utils.h" #include "base/android/scoped_java_ref.h" #include "base/at_exit.h" #include "base/command_line.h" @@ -28,14 +29,6 @@ #include "gtest/gtest.h" #include "testing/android/jni/chrome_native_test_activity_jni.h" -#if defined(REGISTER_NET_UNITTESTS_JNI) -#include "net/android/net_jni_registrar.h" -#endif - -#if defined(REGISTER_CONTENT_UNITTESTS_JNI) -#include "content/app/android/content_jni_registrar.h" -#endif - // The main function of the program to be wrapped as a test apk. extern int main(int argc, char** argv); @@ -183,18 +176,8 @@ static void RunTests(JNIEnv* env, env, env->NewLocalRef(app_context)); base::android::InitApplicationContext(scoped_context); - base::android::RegisterJni(env); - - // A unittest target may define these macros to register JNI dependencies. - // These should only be defined if the target also depends on the - // corresponding registrar. -#if defined(REGISTER_NET_UNITTESTS_JNI) - net::android::RegisterJni(env); -#endif - -#if defined(REGISTER_CONTENT_UNITTESTS_JNI) - content::android::RegisterJni(env); -#endif + base::android::RegisterLocaleUtils(env); + base::android::RegisterPathUtils(env); FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir)); // A few options, such "--gtest_list_tests", will just use printf directly |