diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 17:33:03 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 17:33:03 +0000 |
| commit | c5e56cbd19fbb17f4152b0ab993dac52ba2e5eb4 (patch) | |
| tree | f67c55c50fb20b9b09e63cb3362bb137ef4d17f5 /chrome/test/base/chrome_test_suite.cc | |
| parent | 39f26d1cde18c7e763ec434f7cb226d9380b698e (diff) | |
| download | chromium_src-c5e56cbd19fbb17f4152b0ab993dac52ba2e5eb4.zip chromium_src-c5e56cbd19fbb17f4152b0ab993dac52ba2e5eb4.tar.gz chromium_src-c5e56cbd19fbb17f4152b0ab993dac52ba2e5eb4.tar.bz2 | |
Include chromium_net.jar in unit_tests_apk.
Also Register JNI before running unit_tests on Android.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10827134
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/chrome_test_suite.cc')
| -rw-r--r-- | chrome/test/base/chrome_test_suite.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc index 72b1fba..0606024 100644 --- a/chrome/test/base/chrome_test_suite.cc +++ b/chrome/test/base/chrome_test_suite.cc @@ -31,6 +31,11 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_handle.h" +#if defined(OS_ANDROID) +#include "base/android/jni_android.h" +#include "net/android/net_jni_registrar.h" +#endif + #if defined(OS_MACOSX) #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" @@ -183,6 +188,11 @@ void ChromeTestSuite::Initialize() { chrome_browser_application_mac::RegisterBrowserCrApp(); #endif +#if defined(OS_ANDROID) + // Register JNI bindings for android. + net::android::RegisterJni(base::android::AttachCurrentThread()); +#endif + chrome::RegisterPathProvider(); if (!browser_dir_.empty()) { PathService::Override(base::DIR_EXE, browser_dir_); |