Upstream version 10.39.233.0

[platform/framework/web/crosswalk.git] / src / xwalk / test / android / util / runtime_client / src / org / xwalk / test / util / RuntimeClientApiTestBase.java

diff --git a/src/xwalk/test/android/util/runtime_client/src/org/xwalk/test/util/RuntimeClientApiTestBase.java b/src/xwalk/test/android/util/runtime_client/src/org/xwalk/test/util/RuntimeClientApiTestBase.java
index 0546ec6..6ee210c 100644 (file)
--- a/src/xwalk/test/android/util/runtime_client/src/org/xwalk/test/util/RuntimeClientApiTestBase.java
+++ b/src/xwalk/test/android/util/runtime_client/src/org/xwalk/test/util/RuntimeClientApiTestBase.java
@@ -215,10 +215,9 @@ public class RuntimeClientApiTestBase<T extends Activity> {
 
     // For Cross-Origin XHR.
     public void testCrossOriginXhr() throws Throwable {
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start(4444);
         try {
             // The server will be accessed by XMLHttpRequest from js.
-            webServer = new TestWebServer(false);
             final String path = "/cross_origin_xhr_test.html";
             final String responseStr = "Cross-Origin XHR";
             final String url = webServer.setResponse(path, responseStr, null);
@@ -273,7 +272,7 @@ public class RuntimeClientApiTestBase<T extends Activity> {
                 }
             });
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }