summaryrefslogtreecommitdiffstats
path: root/webkit/glue/unittest_test_server.h
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 05:26:10 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 05:26:10 +0000
commitee287e40bb740d7238717a97b5f635ae3e68c47a (patch)
tree4515656a0a870939dbcf6892b48baa02c99c26ca /webkit/glue/unittest_test_server.h
parent0afe827a49501c6801c3c9efbbdb1f64aa010beb (diff)
downloadchromium_src-ee287e40bb740d7238717a97b5f635ae3e68c47a.zip
chromium_src-ee287e40bb740d7238717a97b5f635ae3e68c47a.tar.gz
chromium_src-ee287e40bb740d7238717a97b5f635ae3e68c47a.tar.bz2
ssl_client_socket_unittest.cc: launch local server with TestServerLauncher
rather than use bugs.webkit.org, fixes TODO(darin) Add tests with bad server certs ssl_client_socket_nss.cc: fix bugs revealed by new tests tcp_pinger.cc: helper class to do synchronous connect from tests. Has to work inside ui tests where one can't use TestCompletionCallback. ssl_test_util: renamed class TestServerLauncher, added Start/Stop methods. Make part of net.lib to work around link error in test_shell_tests. url_request_unittest.h: use TestServerLauncher to manage server. SSL client tests disabled for now on Mac. BUG=7114 Review URL: http://codereview.chromium.org/16207 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/unittest_test_server.h')
-rw-r--r--webkit/glue/unittest_test_server.h5
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;
}