From 5d9c52a60b5e91819c2664572a6e0ef343a3ea28 Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Tue, 30 Dec 2008 23:29:54 +0000 Subject: Revert 7508.7509 and 7510 Review URL: http://codereview.chromium.org/17030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7514 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/unittest_test_server.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'webkit/glue/unittest_test_server.h') diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h index 3e27b875..d9b4ce2 100644 --- a/webkit/glue/unittest_test_server.h +++ b/webkit/glue/unittest_test_server.h @@ -14,22 +14,14 @@ 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 HTTPTestServer { - protected: - UnittestTestServer() { - } - +class UnittestTestServer : public TestServer { public: - 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() : TestServer(TestServer::ManualInit()) { + Init("localhost", 1337, L"webkit/data", std::wstring()); } - virtual ~UnittestTestServer() { + ~UnittestTestServer() { + Shutdown(); } virtual bool MakeGETRequest(const std::string& page_name) { -- cgit v1.1