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

content/common/ssl_status_serialization.h

Index: content/common/ssl_status_serialization.h
diff --git a/content/common/ssl_status_serialization.h b/content/common/ssl_status_serialization.h
index 03675c16986c848d03f68329742d9e0081bc2a9c..af0ac59c24098dc4a85dcb67787d962199dec464 100644
--- a/content/common/ssl_status_serialization.h
+++ b/content/common/ssl_status_serialization.h
@@ -8,12 +8,11 @@
 #include <string>
 
 #include "content/common/content_export.h"
-#include "content/public/common/signed_certificate_timestamp_id_and_status.h"
-#include "net/cert/cert_status_flags.h"
+#include "content/public/common/ssl_status.h"
 
 namespace content {
 
-// Convenience methods for serializing/deserializing the security info.
+// Serializes the given security info.
 CONTENT_EXPORT std::string SerializeSecurityInfo(
     int cert_id,
     net::CertStatus cert_status,
@@ -22,13 +21,9 @@ CONTENT_EXPORT std::string SerializeSecurityInfo(
     const SignedCertificateTimestampIDStatusList&
         signed_certificate_timestamp_ids);
 
-bool DeserializeSecurityInfo(
-    const std::string& state,
-    int* cert_id,
-    net::CertStatus* cert_status,
-    int* security_bits,
-    int* connection_status,
-    SignedCertificateTimestampIDStatusList* signed_certificate_timestamp_ids);
+// Deserializes the given security info. Note that this returns the
+// SecurityStyle and ContentStatus fields with default values.
+SSLStatus DeserializeSecurityInfo(const std::string& state);
 
 }  // namespace content