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

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: typo 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
« no previous file with comments | « content/browser/ssl/ssl_manager.cc ('k') | content/common/ssl_status_serialization.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c5339942fdb4a4c47111a741492a4c9409154dda..aac418d1396e6782b9b79280859c84f781a243ac 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);
« no previous file with comments | « content/browser/ssl/ssl_manager.cc ('k') | content/common/ssl_status_serialization.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698