diff options
| author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 18:25:50 +0000 |
|---|---|---|
| committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 18:25:50 +0000 |
| commit | 9fb0a704e6b2d018fa3988e25f00df3963b25cc4 (patch) | |
| tree | 50c967ab4ae037937cf6eb691e07e43e013df152 /webkit/tools/test_shell/test_shell_main.cc | |
| parent | 4742831eddddff9f2b7aa506861e3c2af3ea73f7 (diff) | |
| download | chromium_src-9fb0a704e6b2d018fa3988e25f00df3963b25cc4.zip chromium_src-9fb0a704e6b2d018fa3988e25f00df3963b25cc4.tar.gz chromium_src-9fb0a704e6b2d018fa3988e25f00df3963b25cc4.tar.bz2 | |
Use the new HTTP stack by default in the net module's
tests, but continue to use WinHTTP by default in the
test shell and chrome.
The mapping of CRYPT_E_NO_REVOCATION_CHECK to
ERR_CERT_NO_REVOCATION_MECHANISM (a certificate error
code) is necessary to make the HTTPSTestServer's start
and shutdown GET commands work. (The TestDelegate
ignores all certificate errors.)
R=darin
Review URL: http://codereview.chromium.org/6472
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3022 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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 96bca74..2415170 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -146,10 +146,13 @@ int main(int argc, char* argv[]) { if (parsed_command_line.HasSwitch(test_shell::kEnableTracing)) base::TraceLog::StartTracing(); +#if defined(OS_WIN) // Make the selection of network stacks early on before any consumers try to // issue HTTP requests. + net::HttpNetworkLayer::UseWinHttp(true); if (parsed_command_line.HasSwitch(test_shell::kUseNewHttp)) net::HttpNetworkLayer::UseWinHttp(false); +#endif bool layout_test_mode = parsed_command_line.HasSwitch(test_shell::kLayoutTests); |