Upstream version 10.39.233.0

[platform/framework/web/crosswalk.git] / src / android_webview / javatests / src / org / chromium / android_webview / test / CookieManagerStartupTest.java

diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
index 9f597e6..f22bb1c 100644 (file)
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java
@@ -61,9 +61,8 @@ public class CookieManagerStartupTest extends AwTestBase {
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testStartup() throws Throwable {
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             String path = "/cookie_test.html";
             String url = webServer.setResponse(path, CommonResources.ABOUT_HTML, null);
 
@@ -87,7 +86,7 @@ public class CookieManagerStartupTest extends AwTestBase {
 
             assertEquals("count=42", cookieManager.getCookie(url));
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }