diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 21:55:55 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 21:55:55 +0000 |
| commit | 4d4eb5babc558ccddc09168f66970905ed0204d4 (patch) | |
| tree | fe23183a39cec251e5fd1d9da4047f2fec020510 /content/test/run_all_unittests.cc | |
| parent | 3ac99b95a6ee9dfaea1d746f795975cc97c7ca45 (diff) | |
| download | chromium_src-4d4eb5babc558ccddc09168f66970905ed0204d4.zip chromium_src-4d4eb5babc558ccddc09168f66970905ed0204d4.tar.gz chromium_src-4d4eb5babc558ccddc09168f66970905ed0204d4.tar.bz2 | |
Relanding "Add apk for running content_browsertests"
Revert "Revert 179189"
This reverts commit 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1.
Original CL:https://codereview.chromium.org/12047068/
was reverted as we failed to update the bot scripts with the new package
name for content_shell_apk
TBR=mark@chromium.org,jam@chromium.org
BUG=138275
Review URL: https://chromiumcodereview.appspot.com/12091033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/run_all_unittests.cc')
| -rw-r--r-- | content/test/run_all_unittests.cc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc index 58de889..695cebe 100644 --- a/content/test/run_all_unittests.cc +++ b/content/test/run_all_unittests.cc @@ -5,25 +5,7 @@ #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" -#include "net/android/net_jni_registrar.h" -#include "ui/android/ui_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); - net::android::RegisterJni(env); - ui::android::RegisterJni(env); -#endif - return content::UnitTestTestSuite( new content::ContentTestSuite(argc, argv)).Run(); } |