diff options
| author | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 22:23:51 +0000 |
|---|---|---|
| committer | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 22:23:51 +0000 |
| commit | b9a9188da43a172c6b299e27075c1486fe4458e2 (patch) | |
| tree | 6185d007f076e0487ec98e2d5f48e4f539bdc102 /chrome/browser/ssl/ssl_policy.cc | |
| parent | cfbbe386c810b373b198525c0d2dab5e4103ada7 (diff) | |
| download | chromium_src-b9a9188da43a172c6b299e27075c1486fe4458e2.zip chromium_src-b9a9188da43a172c6b299e27075c1486fe4458e2.tar.gz chromium_src-b9a9188da43a172c6b299e27075c1486fe4458e2.tar.bz2 | |
Reverting, as this changelist broke unittests on Windows.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_policy.cc')
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 5221c04..9e796fa 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -318,13 +318,9 @@ SSLErrorInfo SSLPolicy::GetSSLErrorInfo(SSLManager::CertError* error) { void SSLPolicy::OnDenyCertificate(SSLManager::CertError* error) { // Default behavior for rejecting a certificate. - // - // While DenyCertForHost() executes synchronously on this thread, - // CancelRequest() gets posted to a different thread. Calling - // DenyCertForHost() first ensures deterministic ordering. + error->CancelRequest(); error->manager()->DenyCertForHost(error->ssl_info().cert, error->request_url().host()); - error->CancelRequest(); } void SSLPolicy::OnAllowCertificate(SSLManager::CertError* error) { @@ -334,13 +330,9 @@ void SSLPolicy::OnAllowCertificate(SSLManager::CertError* error) { // new NavigationEntry will not be set until DidNavigate. This is ok, // because the new NavigationEntry will have its max security style set // within DidNavigate. - // - // While AllowCertForHost() executes synchronously on this thread, - // ContinueRequest() gets posted to a different thread. Calling - // AllowCertForHost() first ensures deterministic ordering. + error->ContinueRequest(); error->manager()->AllowCertForHost(error->ssl_info().cert, error->request_url().host()); - error->ContinueRequest(); } //////////////////////////////////////////////////////////////////////////////// |