1 files changed, 13 insertions, 5 deletions
diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h
index d9b4ce2..3e27b875 100644
--- a/webkit/glue/unittest_test_server.h
+++ b/webkit/glue/unittest_test_server.h
@@ -14,14 +14,22 @@ using webkit_glue::ResourceLoaderBridge;
 // We need to use ResourceLoaderBridge to communicate with the testserver
 // instead of using URLRequest directly because URLRequests need to be run on
 // the test_shell's IO thread.
-class UnittestTestServer : public TestServer {
+class UnittestTestServer : public HTTPTestServer {
+ protected:
+  UnittestTestServer() {
+  }
+
  public:
-  UnittestTestServer() : TestServer(TestServer::ManualInit()) {
-    Init("localhost", 1337, L"webkit/data", std::wstring());
+  static UnittestTestServer* CreateServer() {
+    UnittestTestServer* test_server = new UnittestTestServer();
+    if (!test_server->Init("localhost", 1337, L"webkit/data")) {
+      delete test_server;
+      return NULL;
+    }
+    return test_server;
   }
 
-  ~UnittestTestServer() {
-    Shutdown();
+  virtual ~UnittestTestServer() {
   }
 
   virtual bool MakeGETRequest(const std::string& page_name) {