| Index: webkit/support/platform_support_android.cc
|
| diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
|
| index 40598ab1eeb7e964ef98f3d04bc579813f021a04..4808d74a1241b49632856ef0d8f78c489b38c93a 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) {
|
|
|