Attach a SecurityStyle to each request in ResourceLoader

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 08819d336277969f85daae266919e0871597d02f..ed4062377a5de0ed95e8906d4e6247e7d6ca3f1e 100644
--- a/content/common/ssl_status_serialization.h
+++ b/content/common/ssl_status_serialization.h
@@ -13,20 +13,17 @@
 
 namespace content {
 
-// 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);
+// Serializes the given security info. Does NOT include
+// |ssl_status.content_status| in the serialized info.

[davidben, 2015/07/24 22:21:52]

[Oh, I didn't realize one field was omitted. Meh, this is probably still
cleaner. I'm likely going to need to split up this struct a bit for PlzNavigate
later anyway. I'm thinking browser-side gets a scoped_refptr<X509Certificate>
and it only turns into cert_id when we send it to a renderer.
https://crbug.com/513315

Probably it makes sense to eventually pull content_status outside of SSLStatus
and either have it be a dedicated field of the NavigationEntry or we have
different structs for resource-level security status and the combined page-level
stuff, similar to what was going on with SSLInfo.]

[estark, 2015/07/25 00:38:01]

Yeah, I definitely agree, it's very confusing right now to have |content_status|
-- which only applies to a NavigationEntry -- lumped together with the rest of
the stuff that describes an individual request.

I can possibly do this as a follow-up depending on how quickly you think you'll
get to the PlzNavigate-related split.

+CONTENT_EXPORT std::string SerializeSecurityInfo(const SSLStatus& ssl_status);
 
 // Deserializes the given security info into |ssl_status|. Note that
-// this returns the SecurityStyle and ContentStatus fields with default
-// values. Returns true on success and false if the state couldn't be
-// deserialized. If false, all fields in |ssl_status| will be set to their
-// default values.
+// this returns the |content_status| field with its default
+// value. Returns true on success and false if the state couldn't be
+// deserialized. If false, all fields in |ssl_status| will be set to
+// their default values. Note that this function does not validate that
+// the deserialized SSLStatus is internally consistent (e.g. that the
+// |security_style| matches up with the rest of the fields).
 bool CONTENT_EXPORT
 DeserializeSecurityInfo(const std::string& state,
                         SSLStatus* ssl_status) WARN_UNUSED_RESULT;