diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 19:11:01 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 19:11:01 +0000 |
| commit | dc7852dcb0ea1f3268768b10b9ce4635a4b90492 (patch) | |
| tree | 15b480221e3aa703959162e3bac571a3551b4db0 /content/test/run_all_unittests.cc | |
| parent | 5bee60051101dd6dc4b9496180ee35efbdb0ba84 (diff) | |
| download | chromium_src-dc7852dcb0ea1f3268768b10b9ce4635a4b90492.zip chromium_src-dc7852dcb0ea1f3268768b10b9ce4635a4b90492.tar.gz chromium_src-dc7852dcb0ea1f3268768b10b9ce4635a4b90492.tar.bz2 | |
Register JNI for content_unittests.
Also split the content_jni_registrar into app,browser and common.
BUG=125059
TEST=
Review URL: https://chromiumcodereview.appspot.com/10697030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/run_all_unittests.cc')
| -rw-r--r-- | content/test/run_all_unittests.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc index 695cebe..f90167a 100644 --- a/content/test/run_all_unittests.cc +++ b/content/test/run_all_unittests.cc @@ -5,7 +5,21 @@ #include "content/test/content_test_suite.h" #include "content/public/test/unittest_test_suite.h" +#if defined(OS_ANDROID) +#include "base/android/jni_android.h" +#include "content/browser/android/browser_jni_registrar.h" +#include "content/common/android/common_jni_registrar.h" +#endif + int main(int argc, char** argv) { + +#if defined(OS_ANDROID) + // Register JNI bindings for android. + JNIEnv* env = base::android::AttachCurrentThread(); + content::android::RegisterCommonJni(env); + content::android::RegisterBrowserJni(env); +#endif + return content::UnitTestTestSuite( new content::ContentTestSuite(argc, argv)).Run(); } |