Undo revert http://codereview.chromium.org/23028

Changes since original http://codereview.chromium.org/16207 :
- use Release rather than delete on reference counted objects
- Preserve bool WaitToFinish(int milliseconds) 
  and std::wstring GetDataDirectory() at Tommi's request,
  and add unit test for WaitToFinish().

Review URL: http://codereview.chromium.org/20444

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9992 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 1 deletions

diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h
index 3e27b875..2a83599 100644
--- a/webkit/glue/unittest_test_server.h
+++ b/webkit/glue/unittest_test_server.h
@@ -22,7 +22,10 @@ class UnittestTestServer : public HTTPTestServer {
  public:
   static UnittestTestServer* CreateServer() {
     UnittestTestServer* test_server = new UnittestTestServer();
-    if (!test_server->Init("localhost", 1337, L"webkit/data")) {
+    FilePath no_cert;
+    FilePath docroot = FilePath::FromWStringHack(L"webkit/data");
+    if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
+        "localhost", 1337, docroot, no_cert)) {
       delete test_server;
       return NULL;
     }