diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 19:33:28 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 19:33:28 +0000 |
| commit | b397b06d3a2b7195c5e8bd5b5f456349b53c967e (patch) | |
| tree | abf65732247590b7178f3c886991486581d5262f /testing | |
| parent | 999a9db7ff3104cb7fef5d3021543c062a2473c6 (diff) | |
| download | chromium_src-b397b06d3a2b7195c5e8bd5b5f456349b53c967e.zip chromium_src-b397b06d3a2b7195c5e8bd5b5f456349b53c967e.tar.gz chromium_src-b397b06d3a2b7195c5e8bd5b5f456349b53c967e.tar.bz2 | |
Revert "Use a test specific macro to call JNI registrars during APK tests."
TBR=jam@chromium.org,jrg@chromium.org
(The original CL was submitted with a TBR too, incorrectly categorized as a simple gyp change)
This reverts commit 575ab5330492664079ea89804bec615d15ea3b33.
We intend to do this using run_all_unittests.cc in individual suites.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10662056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -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 |