| Index: content/browser/ssl/ssl_policy.cc
|
| diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
|
| index 9f2acd4595d8365e317cca193e066fbddc126f6c..819d62bc51c2d558c28d329955e8054e9d3e8232 100644
|
| --- a/content/browser/ssl/ssl_policy.cc
|
| +++ b/content/browser/ssl/ssl_policy.cc
|
| @@ -163,9 +163,9 @@ void SSLPolicy::DidRunContentWithCertErrors(NavigationEntryImpl* entry,
|
| }
|
|
|
| void SSLPolicy::OnRequestStarted(const GURL& url,
|
| - int cert_id,
|
| + bool has_certificate,
|
| net::CertStatus cert_status) {
|
| - if (cert_id && url.SchemeIsCryptographic() &&
|
| + if (has_certificate && url.SchemeIsCryptographic() &&
|
| !net::IsCertStatusError(cert_status)) {
|
| // If the scheme is https: or wss: *and* the security info for the
|
| // cert has been set (i.e. the cert id is not 0) and the cert did
|
| @@ -259,7 +259,8 @@ void SSLPolicy::InitializeEntryIfNeeded(NavigationEntryImpl* entry) {
|
| return;
|
|
|
| entry->GetSSL().security_style = GetSecurityStyleForResource(
|
| - entry->GetURL(), !!entry->GetSSL().cert_id, entry->GetSSL().cert_status);
|
| + entry->GetURL(), !!entry->GetSSL().certificate.get(),
|
| + entry->GetSSL().cert_status);
|
| }
|
|
|
| } // namespace content
|
|
|