Clean up the interface to DeserializeSecurityInfo, fix uninitialized memory use.

BUG=507018
TEST=clusterfuzz is happy

Review URL: https://codereview.chromium.org/1225983003

Cr-Commit-Position: refs/heads/master@{#337883}

1 files changed, 3 insertions, 22 deletions

diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 865ca60..6f258a7 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -115,29 +115,10 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) {
 
   if (details.is_main_frame) {
     if (entry) {
-      // Decode the security details.
-      int ssl_cert_id;
-      net::CertStatus ssl_cert_status;
-      int ssl_security_bits;
-      int ssl_connection_status;
-      SignedCertificateTimestampIDStatusList
-          ssl_signed_certificate_timestamp_ids;
-      DeserializeSecurityInfo(details.serialized_security_info,
-                              &ssl_cert_id,
-                              &ssl_cert_status,
-                              &ssl_security_bits,
-                              &ssl_connection_status,
-                              &ssl_signed_certificate_timestamp_ids);
-
       // We may not have an entry if this is a navigation to an initial blank
-      // page. Reset the SSL information and add the new data we have.
-      entry->GetSSL() = SSLStatus();
-      entry->GetSSL().cert_id = ssl_cert_id;
-      entry->GetSSL().cert_status = ssl_cert_status;
-      entry->GetSSL().security_bits = ssl_security_bits;
-      entry->GetSSL().connection_status = ssl_connection_status;
-      entry->GetSSL().signed_certificate_timestamp_ids =
-          ssl_signed_certificate_timestamp_ids;
+      // page. Add the new data we have.
+      entry->GetSSL() =
+          DeserializeSecurityInfo(details.serialized_security_info);
     }
   }