Add constructor to create SSLStatus from SSLInfo
This constructor is now used from several places that set SSLStatus
fields themselves, to reduce the risk of such places forgetting to set
fields. This was causing bugs on WebsiteSettings for SSL interstitials
(which were not setting the connection_status field, among others).
BUG=529456
Review URL: https://codereview.chromium.org/1332633002
Cr-Commit-Position: refs/heads/master@{#348519}
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index e1f1bf9..d397a06 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -71,14 +71,9 @@
StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps,
child_id, &signed_certificate_timestamp_ids);
- ssl_status->cert_id = cert_id;
- ssl_status->cert_status = ssl_info.cert_status;
- ssl_status->security_bits = ssl_info.security_bits;
- ssl_status->connection_status = ssl_info.connection_status;
- ssl_status->signed_certificate_timestamp_ids =
- signed_certificate_timestamp_ids;
- ssl_status->security_style =
- SSLPolicy::GetSecurityStyleForResource(url, *ssl_status);
+ *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource(
+ url, cert_id, ssl_info.cert_status),
+ cert_id, signed_certificate_timestamp_ids, ssl_info);
}
void PopulateResourceResponse(ResourceRequestInfoImpl* info,
