diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 03:54:48 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 03:54:48 +0000 |
| commit | c3dd8ee7dcb3b4aef1f811ec210d7b02ecf857a1 (patch) | |
| tree | 1e17d04d645896270e0403409e98f79112390ee1 /webkit | |
| parent | 900b573af324093c6cb13df2f897a72789c9da42 (diff) | |
| download | chromium_src-c3dd8ee7dcb3b4aef1f811ec210d7b02ecf857a1.zip chromium_src-c3dd8ee7dcb3b4aef1f811ec210d7b02ecf857a1.tar.gz chromium_src-c3dd8ee7dcb3b4aef1f811ec210d7b02ecf857a1.tar.bz2 | |
Setup network JNI for webkit_unit_tests.
JNI was intentionally not setup for webkit_unit_tests since we were not building an
APK for testing not so long ago. We can now setup JNI.
This will fix tests like AssociatedURLLoaderTest.SameOriginSuccess that were
failing internally after I tried to eliminate some unnecessary diffs we have in
net/ (e.g.: see 0f9f6577da12fa112442a4f5aff17e171db5e96f internally).
TEST=webkit_unit_tests
Review URL: https://chromiumcodereview.appspot.com/10916056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/platform_support_android.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index 40598ab..4808d74 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -43,13 +43,11 @@ void BeforeInitialize(bool unit_test_mode) { // loading and complaining the non-exsistent /etc/xml/catalog file. setenv("XML_CATALOG_FILES", "", 0); - // For now TestWebKitAPI and webkit_unit_tests are standalone executables - // which don't have Java capabilities. Init Java for only DumpRenderTree. - if (!unit_test_mode) { - JNIEnv* env = base::android::AttachCurrentThread(); + JNIEnv* env = base::android::AttachCurrentThread(); + net::android::RegisterNetworkLibrary(env); + + if (!unit_test_mode) media::MediaPlayerListener::RegisterMediaPlayerListener(env); - net::android::RegisterNetworkLibrary(env); - } } void AfterInitialize(bool unit_test_mode) { |