Fix TestWebKitAPI and webkit_unit_tests on Android.

webkit/support/platform_support_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/support/platform_support.h"
 
 #include "base/android/jni_android.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
 
 namespace webkit_support {
 
 void BeforeInitialize(bool unit_test_mode) {
   InitAndroidTestPaths();
 
   // Set XML_CATALOG_FILES environment variable to blank to prevent libxml from
   // loading and complaining the non-exsistent /etc/xml/catalog file.
   setenv("XML_CATALOG_FILES", "", 0);
 
-  JNIEnv* env = base::android::AttachCurrentThread();
-  net::android::RegisterNetworkLibrary(env);
+  // 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();
+    net::android::RegisterNetworkLibrary(env);
+  }
 }
 
 void AfterInitialize(bool unit_test_mode) {
   if (unit_test_mode)
     return;  // We don't have a resource pack when running the unit-tests.
 
   FilePath data_path(kDumpRenderTreeDir);
   data_path = data_path.Append("DumpRenderTree.pak");
   ResourceBundle::InitSharedInstanceWithPakFile(data_path);
 
@@ skipping 47 matching lines @@
         if (!success)
           LOG(FATAL) << "Failed reading: " << path.value();
       }
       return resize_corner_data;
     }
   }
 
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       resource_id, scale_factor);
 }