From 73e0bbac9d097eff34726194d2095dce90f2dfa3 Mon Sep 17 00:00:00 2001 From: "dkegel@google.com" Date: Thu, 19 Feb 2009 22:57:09 +0000 Subject: Enable SSL error handling in Linux again. Evan, could you review the change since http://codereview.chromium.org/20444 : - load temporary root cert in test_shell Thanks! Review URL: http://codereview.chromium.org/20511 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10055 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/unittest_test_server.h | 5 ++++- webkit/tools/test_shell/test_shell_main.cc | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'webkit') 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; } diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 08b8c07..9604dc7 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -23,6 +23,7 @@ #include "net/base/cookie_monster.h" #include "net/base/net_module.h" #include "net/http/http_cache.h" +#include "net/base/ssl_test_util.h" #include "net/url_request/url_request_context.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" @@ -129,6 +130,10 @@ int main(int argc, char* argv[]) { // Config the network module so it has access to a limited set of resources. net::NetModule::SetResourceProvider(TestShell::NetResourceProvider); + // On Linux, load the test root certificate. + net::TestServerLauncher ssl_util; + ssl_util.LoadTestRootCert(); + platform.InitializeGUI(); TestShell::InitializeTestShell(layout_test_mode); -- cgit v1.1