diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 22:57:09 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 22:57:09 +0000 |
| commit | 73e0bbac9d097eff34726194d2095dce90f2dfa3 (patch) | |
| tree | da2f14f77ee83984118e733a231ada709432ea52 /webkit/tools/test_shell/test_shell_main.cc | |
| parent | cefe1497a83ce69c7da0cec320e258e6f87b3aa9 (diff) | |
| download | chromium_src-73e0bbac9d097eff34726194d2095dce90f2dfa3.zip chromium_src-73e0bbac9d097eff34726194d2095dce90f2dfa3.tar.gz chromium_src-73e0bbac9d097eff34726194d2095dce90f2dfa3.tar.bz2 | |
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
Diffstat (limited to 'webkit/tools/test_shell/test_shell_main.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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); |