Remove SSLStatus::security_style member and content::SecurityStyle

content/child/web_url_loader_impl.cc

Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 11431b1e48ed683d7ac312a451601c97c8a86303..7e0facb674237e2e7d6bb079aa99ba4612632b9f 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -34,7 +34,6 @@
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request.h"
 #include "content/common/resource_request_body_impl.h"
-#include "content/common/security_style_util.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/common/url_loader.mojom.h"
 #include "content/public/child/fixed_received_data.h"
@@ -98,6 +97,29 @@ const char* const kReplaceHeaders[] = {
 
 using HeadersVector = ResourceDevToolsInfo::HeadersVector;
 
+// TODO(estark): Figure out a way for the embedder to provide the
+// security style for a resource. Ideally, the logic for assigning
+// per-resource security styles should live in the same place as the
+// logic for assigning per-page security styles (which lives in the
+// embedder). It would also be nice for the embedder to have the chance
+// to control the per-resource security style beyond the simple logic
+// here. (For example, the embedder might want to mark certain resources
+// differently if they use SHA1 signatures.) https://crbug.com/648326
+SecurityStyle GetSecurityStyleForResource(const GURL& url,
+                                          net::CertStatus cert_status) {
+  if (!url.SchemeIsCryptographic())
+    return SECURITY_STYLE_UNAUTHENTICATED;
+
+  // Minor errors don't lower the security style to
+  // SECURITY_STYLE_AUTHENTICATION_BROKEN.
+  if (net::IsCertStatusError(cert_status) &&
+      !net::IsCertStatusMinorError(cert_status)) {
+    return SECURITY_STYLE_AUTHENTICATION_BROKEN;
+  }
+
+  return SECURITY_STYLE_AUTHENTICATED;
+}
+
 // Converts timing data from |load_timing| to the format used by WebKit.
 void PopulateURLLoadTiming(const net::LoadTimingInfo& load_timing,
                            WebURLLoadTiming* url_timing) {
@@ -257,8 +279,8 @@ void SetSecurityStyleAndDetails(const GURL& url,
     }
   }
 
-  SecurityStyle security_style = GetSecurityStyleForResource(
-      url, true, info.cert_status);
+  SecurityStyle security_style =
+      GetSecurityStyleForResource(url, info.cert_status);

[estark, 2016/10/06 22:00:17]

note that this is only for devtools (thereby sticking to the theme that
securitystyle-is-for-devtools); we early-return at the top of this function if
|report_security_info| is false, and it's only true when we need security info
for devtools.

 
   blink::WebURLResponse::SecurityStyle security_style_blink =
       WebURLResponse::SecurityStyleUnknown;