Attach a SecurityStyle to each request in ResourceLoader

content/common/ssl_status_serialization_unittest.cc

Index: content/common/ssl_status_serialization_unittest.cc
diff --git a/content/common/ssl_status_serialization_unittest.cc b/content/common/ssl_status_serialization_unittest.cc
index f5595c2e3ce0a5c584481c4d9ada18d1c583568d..f8b4852f757440f270f3b685a326b679ac5ba7ef 100644
--- a/content/common/ssl_status_serialization_unittest.cc
+++ b/content/common/ssl_status_serialization_unittest.cc
@@ -13,28 +13,28 @@ namespace content {
 // deserialization and deserializes correctly.
 TEST(SSLStatusSerializationTest, DeserializeSerializedStatus) {
   // Serialize dummy data and test that it deserializes properly.
-  int cert_id = 1;
-  net::CertStatus cert_status = net::CERT_STATUS_DATE_INVALID;
-  int security_bits = 80;
-  int connection_status = net::SSL_CONNECTION_VERSION_TLS1_2;
-  SignedCertificateTimestampIDStatusList sct_list;
+  SSLStatus status;
+  status.security_style = SECURITY_STYLE_AUTHENTICATED;
+  status.cert_id = 1;
+  status.cert_status = net::CERT_STATUS_DATE_INVALID;
+  status.security_bits = 80;
+  status.connection_status = net::SSL_CONNECTION_VERSION_TLS1_2;
   SignedCertificateTimestampIDAndStatus sct(1, net::ct::SCT_STATUS_OK);
-  sct_list.push_back(sct);
+  status.signed_certificate_timestamp_ids.push_back(sct);
 
-  std::string serialized = SerializeSecurityInfo(
-      cert_id, cert_status, security_bits, connection_status, sct_list);
+  std::string serialized = SerializeSecurityInfo(status);
 
   SSLStatus deserialized;
   ASSERT_TRUE(DeserializeSecurityInfo(serialized, &deserialized));
-  EXPECT_EQ(cert_id, deserialized.cert_id);
-  EXPECT_EQ(cert_status, deserialized.cert_status);
-  EXPECT_EQ(security_bits, deserialized.security_bits);
-  EXPECT_EQ(connection_status, deserialized.connection_status);
-  EXPECT_EQ(sct_list.size(),
+  EXPECT_EQ(status.security_style, deserialized.security_style);
+  EXPECT_EQ(status.cert_id, deserialized.cert_id);
+  EXPECT_EQ(status.cert_status, deserialized.cert_status);
+  EXPECT_EQ(status.security_bits, deserialized.security_bits);
+  EXPECT_EQ(status.connection_status, deserialized.connection_status);
+  EXPECT_EQ(status.signed_certificate_timestamp_ids.size(),
             deserialized.signed_certificate_timestamp_ids.size());
   EXPECT_EQ(sct, deserialized.signed_certificate_timestamp_ids[0]);
-  // Test that the other fields have default (initialized) values.
-  EXPECT_EQ(SECURITY_STYLE_UNKNOWN, deserialized.security_style);
+  // Test that |content_status| has the default (initialized) value.
   EXPECT_EQ(SSLStatus::NORMAL_CONTENT, deserialized.content_status);
 }
 
@@ -62,18 +62,37 @@ TEST(SSLStatusSerializationTest, DeserializeBogusStatus) {
 
   // Serialize a status with a bad |security_bits| value and test that
   // deserializing it fails.
-  int cert_id = 1;
-  net::CertStatus cert_status = net::CERT_STATUS_DATE_INVALID;
+  SSLStatus status;
+  status.security_style = SECURITY_STYLE_AUTHENTICATED;
+  status.cert_id = 1;
+  status.cert_status = net::CERT_STATUS_DATE_INVALID;
   // |security_bits| must be <-1. (-1 means the strength is unknown, and
   // |0 means the connection is not encrypted).
-  int security_bits = -5;
-  int connection_status = net::SSL_CONNECTION_VERSION_TLS1_2;
-  SignedCertificateTimestampIDStatusList sct_list;
+  status.security_bits = -5;
+  status.connection_status = net::SSL_CONNECTION_VERSION_TLS1_2;
   SignedCertificateTimestampIDAndStatus sct(1, net::ct::SCT_STATUS_OK);
-  sct_list.push_back(sct);
+  status.signed_certificate_timestamp_ids.push_back(sct);
 
-  std::string serialized = SerializeSecurityInfo(
-      cert_id, cert_status, security_bits, connection_status, sct_list);
+  std::string serialized = SerializeSecurityInfo(status);
+  ASSERT_FALSE(DeserializeSecurityInfo(serialized, &invalid_deserialized));
+
+  EXPECT_EQ(default_ssl_status.security_style,
+            invalid_deserialized.security_style);
+  EXPECT_EQ(default_ssl_status.cert_id, invalid_deserialized.cert_id);
+  EXPECT_EQ(default_ssl_status.cert_status, invalid_deserialized.cert_status);
+  EXPECT_EQ(default_ssl_status.security_bits,
+            invalid_deserialized.security_bits);
+  EXPECT_EQ(default_ssl_status.connection_status,
+            invalid_deserialized.connection_status);
+  EXPECT_EQ(default_ssl_status.content_status,
+            invalid_deserialized.content_status);
+  EXPECT_EQ(0u, invalid_deserialized.signed_certificate_timestamp_ids.size());
+
+  // Now serialize a status with a bad |security_style| value and test
+  // that deserializing fails.
+  status.security_bits = 128;
+  status.security_style = static_cast<SecurityStyle>(100);
+  serialized = SerializeSecurityInfo(status);
   ASSERT_FALSE(DeserializeSecurityInfo(serialized, &invalid_deserialized));
 
   EXPECT_EQ(default_ssl_status.security_style,