Remove SSLStatus::security_style member and content::SecurityStyle

chrome/browser/android/policy/policy_auditor.cc

Index: chrome/browser/android/policy/policy_auditor.cc
diff --git a/chrome/browser/android/policy/policy_auditor.cc b/chrome/browser/android/policy/policy_auditor.cc
index dda42e595a4b4ffd6c15a14fd9e204548934cd71..fbfce5b304d289318f4bcb32dcae3b929d9846fa 100644
--- a/chrome/browser/android/policy/policy_auditor.cc
+++ b/chrome/browser/android/policy/policy_auditor.cc
@@ -39,30 +39,23 @@ int GetCertificateFailure(JNIEnv* env,
     return NONE;
 
   const content::SSLStatus& ssl = entry->GetSSL();
-  switch (ssl.security_style) {
-    case content::SECURITY_STYLE_WARNING:
-    case content::SECURITY_STYLE_UNKNOWN:
-    case content::SECURITY_STYLE_UNAUTHENTICATED:
-      return NONE;
-
-    case content::SECURITY_STYLE_AUTHENTICATION_BROKEN:
-    case content::SECURITY_STYLE_AUTHENTICATED: {
-      if (net::IsCertStatusError(ssl.cert_status)) {
-        if (ssl.cert_status & net::CERT_STATUS_AUTHORITY_INVALID)
-          return CERTIFICATE_FAIL_UNTRUSTED;
-        if (ssl.cert_status & net::CERT_STATUS_REVOKED)
-          return CERTIFICATE_FAIL_REVOKED;
-        // No mapping for CERTIFICATE_FAIL_NOT_YET_VALID.
-        if (ssl.cert_status & net::CERT_STATUS_DATE_INVALID)
-          return CERTIFICATE_FAIL_EXPIRED;
-        if (ssl.cert_status & net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION)
-          return CERTIFICATE_FAIL_UNABLE_TO_CHECK_REVOCATION_STATUS;
-        return CERTIFICATE_FAIL_UNSPECIFIED;
-      }
-      if (ssl.content_status &
-             content::SSLStatus::DISPLAYED_INSECURE_CONTENT) {
-        return CERTIFICATE_FAIL_UNSPECIFIED;
-      }
+  if (ssl.certificate && entry->GetURL().SchemeIsCryptographic()) {
+    if (net::IsCertStatusError(ssl.cert_status)) {
+      if (ssl.cert_status & net::CERT_STATUS_AUTHORITY_INVALID)
+        return CERTIFICATE_FAIL_UNTRUSTED;
+      if (ssl.cert_status & net::CERT_STATUS_REVOKED)
+        return CERTIFICATE_FAIL_REVOKED;
+      // No mapping for CERTIFICATE_FAIL_NOT_YET_VALID.
+      if (ssl.cert_status & net::CERT_STATUS_DATE_INVALID)
+        return CERTIFICATE_FAIL_EXPIRED;
+      if (ssl.cert_status & net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION)
+        return CERTIFICATE_FAIL_UNABLE_TO_CHECK_REVOCATION_STATUS;
+      return CERTIFICATE_FAIL_UNSPECIFIED;

[meacer, 2016/10/10 23:43:17]

nit: maybe it's me, but this code looks prone to goto fail. Perhaps it could use
more curly braces.

[estark, 2016/10/11 01:16:27]

Yeah, I like curly braces too. Done.

+    }
+    if (ssl.content_status & content::SSLStatus::DISPLAYED_INSECURE_CONTENT ||
+        ssl.content_status &
+            content::SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS) {
+      return CERTIFICATE_FAIL_UNSPECIFIED;
     }
   }
   return NONE;