| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index 3df8edb12fb483d5ba4ad4ef7a8c350a20cee49d..979168156b0de18fdbfa55ee71ee2b8fc8080e22 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -2914,18 +2914,11 @@ void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
|
| ResourceType resource_type) {
|
|
|
| // Send out a notification that we loaded a resource from our memory cache.
|
| - int cert_id = 0;
|
| - net::CertStatus cert_status = 0;
|
| - int security_bits = -1;
|
| - int connection_status = 0;
|
| - SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids;
|
| - DeserializeSecurityInfo(security_info, &cert_id, &cert_status,
|
| - &security_bits, &connection_status,
|
| - &signed_certificate_timestamp_ids);
|
| - // TODO(alcutter,eranm): Pass signed_certificate_timestamp_ids into details
|
| + SSLStatus status = DeserializeSecurityInfo(security_info);
|
| + // TODO(alcutter,eranm): Pass signed_certificate_timestamp_ids into details.
|
| LoadFromMemoryCacheDetails details(
|
| - url, GetRenderProcessHost()->GetID(), cert_id, cert_status, http_method,
|
| - mime_type, resource_type);
|
| + url, GetRenderProcessHost()->GetID(), status.cert_id, status.cert_status,
|
| + http_method, mime_type, resource_type);
|
|
|
| controller_.ssl_manager()->DidLoadFromMemoryCache(details);
|
|
|
|
|