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 23:14:35 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 23:14:35 +0000
commit518fdec3a07a94dc45d6e7e4ad1b529747dc03d3 (patch)
treefb2b17479a907a8960a8dc865630fe7272d041fc /webkit/glue/unittest_test_server.h
parent5e997eacfb2234633831d06c91859ee76af44468 (diff)
downloadchromium_src-518fdec3a07a94dc45d6e7e4ad1b529747dc03d3.zip
chromium_src-518fdec3a07a94dc45d6e7e4ad1b529747dc03d3.tar.gz
chromium_src-518fdec3a07a94dc45d6e7e4ad1b529747dc03d3.tar.bz2
Reverting r9823 (http://codereview.chromium.org/16207) because
1) the Interactive Tests (dbg) buildbot needs the SSL cert installed 2) the same buildbot showed a refcounting problem, e.g. FATAL:ref_counted.cc(22)] Check failed: in_dtor_. RefCounted object deleted without calling Release() c:\b\slave\chromium-dbg-builder\build\src\chrome\browser\views\find_bar_win_interactive_uitest.cc(57): error: Value of: NULL != server.get() Actual: false Expected: true [ FAILED ] FindInPageTest.CrashEscHandlers (2109 ms) 3) the Webkit Linux buildbot failed four tests redirect302-frames.html cross-frame-access-protocol-explicit-domain.html cross-frame-access-protocol.html origin-header-for-https.html I'm leaving the tcp_pinger files in for the moment, they shouldn't hurt anything. Review URL: http://codereview.chromium.org/23028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9827 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, 1 insertions, 4 deletions
diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h
index 2a83599..3e27b875 100644
--- a/webkit/glue/unittest_test_server.h
+++ b/webkit/glue/unittest_test_server.h
@@ -22,10 +22,7 @@ class UnittestTestServer : public HTTPTestServer {
public:
static UnittestTestServer* CreateServer() {
UnittestTestServer* test_server = new UnittestTestServer();
- FilePath no_cert;
- FilePath docroot = FilePath::FromWStringHack(L"webkit/data");
- if (!test_server->Start(net::TestServerLauncher::ProtoHTTP,
- "localhost", 1337, docroot, no_cert)) {
+ if (!test_server->Init("localhost", 1337, L"webkit/data")) {
delete test_server;
return NULL;
}