summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/support/platform_support_android.cc10
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) {