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

content/common/ssl_status_serialization.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_SSL_STATUS_SERIALIZATION_H_
 #define CONTENT_COMMON_SSL_STATUS_SERIALIZATION_H_
 
 #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,
     int security_bits,
     int connection_status,
     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);
+// Deerializes the given security info. Note that this returns the SecurityStyle

[estark, 2015/07/08 18:17:42]

Deserializes (missing first s)

[Avi (use Gerrit), 2015/07/08 18:30:00]

Done.

+// and ContentStatus fields with default values.
+SSLStatus DeserializeSecurityInfo(const std::string& state);
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_SSL_STATUS_SERIALIZATION_H_