Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1975)

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1225983003: Clean up the interface to DeserializeSecurityInfo, fix uninitialized memory use. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698