Start server thread in new TestWebServer.start() method rather than constructor

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java

 // Copyright 2013 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.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 43 matching lines @@
         mContentsClient = contentsClient;
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(mContentsClient);
         mAwContents = testContainerView.getAwContents();
         mAwContents.getSettings().setJavaScriptEnabled(true);
     }
 
     @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);
 
             AwCookieManager cookieManager = new AwCookieManager();
             assertNotNull(cookieManager);
 
             CookieUtils.clearCookies(this, cookieManager);
             assertFalse(cookieManager.hasCookies());
 
             cookieManager.setAcceptCookie(true);
             assertTrue(cookieManager.acceptCookie());
 
             cookieManager.setCookie(url, "count=41");
 
             startChromium();
             loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
             executeJavaScriptAndWaitForResult(
                     mAwContents,
                     mContentsClient,
                     "var c=document.cookie.split('=');document.cookie=c[0]+'='+(1+(+c[1]));");
 
             assertEquals("count=42", cookieManager.getCookie(url));
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Privacy"})
     public void testAllowFileSchemeCookies() throws Throwable {
         AwCookieManager cookieManager = new AwCookieManager();
         assertFalse(cookieManager.allowFileSchemeCookies());
         cookieManager.setAcceptFileSchemeCookies(true);
         assertTrue(cookieManager.allowFileSchemeCookies());
@@ skipping 22 matching lines @@
             public AwWebResourceResponse shouldInterceptRequest(
                     ShouldInterceptRequestParams params) {
                 (new AwCookieManager()).getCookie("www.example.com");
                 return null;
             }
         };
         startChromiumWithClient(contentsClient);
         loadUrlSync(mAwContents, contentsClient.getOnPageFinishedHelper(), url);
     }
 }