CT: Adding preliminary Certificate Transparency support to Chromium.

content/common/ssl_status_serialization.cc

Index: content/common/ssl_status_serialization.cc
diff --git a/content/common/ssl_status_serialization.cc b/content/common/ssl_status_serialization.cc
index 87593a595a2589e4b2d962dbb968b998e097af96..c60564ff09b616d0f4f001b32b1f6d79877ea300 100644
--- a/content/common/ssl_status_serialization.cc
+++ b/content/common/ssl_status_serialization.cc
@@ -12,12 +12,14 @@ namespace content {
 std::string SerializeSecurityInfo(int cert_id,
                                   net::CertStatus cert_status,
                                   int security_bits,
-                                  int ssl_connection_status) {
+                                  int ssl_connection_status,
+                                  int signed_certificate_timestamp_id) {
   Pickle pickle;
   pickle.WriteInt(cert_id);
   pickle.WriteUInt32(cert_status);
   pickle.WriteInt(security_bits);
   pickle.WriteInt(ssl_connection_status);
+  pickle.WriteInt(signed_certificate_timestamp_id);
   return std::string(static_cast<const char*>(pickle.data()), pickle.size());
 }
 
@@ -25,7 +27,8 @@ bool DeserializeSecurityInfo(const std::string& state,
                              int* cert_id,
                              net::CertStatus* cert_status,
                              int* security_bits,
-                             int* ssl_connection_status) {
+                             int* ssl_connection_status,
+                             int* signed_certificate_timestamp_id) {
   DCHECK(cert_id && cert_status && security_bits && ssl_connection_status);
   if (state.empty()) {
     // No SSL used.
@@ -34,6 +37,7 @@ bool DeserializeSecurityInfo(const std::string& state,
     *cert_status = 0;
     *security_bits = -1;
     *ssl_connection_status = 0;
+    *signed_certificate_timestamp_id = 0;
     return false;
   }
 
@@ -42,7 +46,8 @@ bool DeserializeSecurityInfo(const std::string& state,
   return pickle.ReadInt(&iter, cert_id) &&
          pickle.ReadUInt32(&iter, cert_status) &&
          pickle.ReadInt(&iter, security_bits) &&
-         pickle.ReadInt(&iter, ssl_connection_status);
+         pickle.ReadInt(&iter, ssl_connection_status) &&
+         pickle.ReadInt(&iter, signed_certificate_timestamp_id);
 }
 
 }  // namespace content